subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1785124 - /subversion/trunk/tools/client-side/svnconflict/svnconflict.c
Date Thu, 02 Mar 2017 13:08:00 GMT
Author: brane
Date: Thu Mar  2 13:07:59 2017
New Revision: 1785124

URL: http://svn.apache.org/viewvc?rev=1785124&view=rev
Log:
Remove warning -Wmissing-variable-declarations in svnconflict.

* tools/client-side/svnconflict/svnconflict.c
  (svnconflict_options, svnconflict_global_options, svnconflict_cmd_table):
   Move global variables to static scope.

Modified:
    subversion/trunk/tools/client-side/svnconflict/svnconflict.c

Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1785124&r1=1785123&r2=1785124&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Thu Mar  2 13:07:59 2017
@@ -86,7 +86,7 @@ typedef enum svnconflict_longopt_t {
 
 /* Option codes and descriptions.
  * The entire list must be terminated with an entry of nulls. */
-const apr_getopt_option_t svnconflict_options[] =
+static const apr_getopt_option_t svnconflict_options[] =
 {
   {"help",          'h', 0, N_("show help on a subcommand")},
   {NULL,            '?', 0, N_("show help on a subcommand")},
@@ -140,10 +140,10 @@ static svn_error_t * svnconflict_resolve
  */
 
 /* Options that apply to all commands. */
-const int svnconflict_global_options[] =
+static const int svnconflict_global_options[] =
 { opt_auth_username, opt_auth_password, opt_config_dir, opt_config_options, 0 };
 
-const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] =
+static const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] =
 {
   /* This command is also invoked if we see option "--help", "-h" or "-?". */
   { "help", svnconflict_help, {"?", "h"}, N_



Mime
View raw message