Author: ivan
Date: Fri Oct 14 14:36:39 2016
New Revision: 1764919
URL: http://svn.apache.org/viewvc?rev=1764919&view=rev
Log:
Improve C90 compatibility by removing trailing commas in enum lists as well as
converting a variadic macro stub with an empty function.
* subversion/include/svn_client.h
* subversion/include/svn_wc.h
* subversion/libsvn_subr/cache-membuffer.c
* subversion/svn/svn.c
* subversion/svnmucc/svnmucc.c
(svn_client_config_option_id_t, svn_wc_notify_action_t,
prefix_pool_create, svn_cl__longopt_t, sub_main): Remove trailing commas
in enum lists.
* tools/dev/svnmover/linenoise/linenouse.c
(lndebug): Replace variadic macro stub with an empty variadic function.
Patch by: Patrick Steinhardt <ps{_AT_}pks.im>
(Log message tweaked by me.)
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Oct 14 14:36:39 2016
@@ -4427,7 +4427,7 @@ typedef enum svn_client_conflict_option_
svn_client_conflict_option_incoming_move_dir_merge,
/* Options for local move vs incoming edit on merge. */
- svn_client_conflict_option_local_move_file_text_merge,
+ svn_client_conflict_option_local_move_file_text_merge
} svn_client_conflict_option_id_t;
/**
Modified: subversion/trunk/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri Oct 14 14:36:39 2016
@@ -1303,7 +1303,7 @@ typedef enum svn_wc_notify_action_t
/** Done searching the repository for details about a conflict.
* @since New in 1.10. */
- svn_wc_notify_end_search_tree_conflict_details,
+ svn_wc_notify_end_search_tree_conflict_details
} svn_wc_notify_action_t;
Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Fri Oct 14
14:36:39 2016
@@ -287,7 +287,7 @@ prefix_pool_create(prefix_pool_t **prefi
* substantially below this. If we accidentally do, we will simply
* run out of entries in the VALUES array before running out of
* allocated memory. */
- ESTIMATED_BYTES_PER_ENTRY = 120,
+ ESTIMATED_BYTES_PER_ENTRY = 120
};
/* Number of entries we are going to support. */
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Oct 14 14:36:39 2016
@@ -143,7 +143,7 @@ typedef enum svn_cl__longopt_t {
opt_show_passwords,
opt_pin_externals,
opt_show_item,
- opt_adds_as_modification,
+ opt_adds_as_modification
} svn_cl__longopt_t;
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Fri Oct 14 14:36:39 2016
@@ -480,7 +480,7 @@ sub_main(int *exit_code, int argc, const
non_interactive_opt,
force_interactive_opt,
trust_server_cert_opt,
- trust_server_cert_failures_opt,
+ trust_server_cert_failures_opt
};
static const apr_getopt_option_t options[] = {
{"message", 'm', 1, ""},
Modified: subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c?rev=1764919&r1=1764918&r2=1764919&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c (original)
+++ subversion/trunk/tools/dev/svnmover/linenoise/linenoise.c Fri Oct 14
14:36:39 2016
@@ -196,7 +196,7 @@ FILE *lndebug_fp = NULL;
fflush(lndebug_fp); \
} while (0)
#else
-#define lndebug(fmt, ...)
+static void lndebug(const char *fmt, ...) { }
#endif
/* ======================= Low level terminal handling ======================
*/
