You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/12/09 19:31:22 UTC

svn commit: r1044071 - /subversion/trunk/subversion/svnrdump/svnrdump.c

Author: cmpilato
Date: Thu Dec  9 18:31:22 2010
New Revision: 1044071

URL: http://svn.apache.org/viewvc?rev=1044071&view=rev
Log:
A little follow-up to r1044068, for convenience.

* subversion/svnrdump/svnrdump.c
  (enum svn_svnrdump__longopt_t): Reorder these, grouping similar ones.
  (SVN_SVNRDUMP__BASE_OPTIONS): New convenience #define.
  (svnrdump__cmd_table): Use SVN_SVNRDUMP__BASE_OPTIONS where applicable.
 

Modified:
    subversion/trunk/subversion/svnrdump/svnrdump.c

Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1044071&r1=1044070&r2=1044071&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Thu Dec  9 18:31:22 2010
@@ -74,14 +74,21 @@ static svn_opt_subcommand_t dump_cmd, lo
 enum svn_svnrdump__longopt_t
   {
     opt_config_dir = SVN_OPT_FIRST_LONGOPT_ID,
+    opt_config_option,
     opt_auth_username,
     opt_auth_password,
-    opt_non_interactive,
     opt_auth_nocache,
+    opt_non_interactive,
     opt_version,
-    opt_config_option,
   };
 
+#define SVN_SVNRDUMP__BASE_OPTIONS opt_config_dir, \
+                                   opt_config_option, \
+                                   opt_auth_username, \
+                                   opt_auth_password, \
+                                   opt_auth_nocache, \
+                                   opt_non_interactive
+
 static const svn_opt_subcommand_desc2_t svnrdump__cmd_table[] =
 {
   { "dump", dump_cmd, { 0 },
@@ -89,13 +96,11 @@ static const svn_opt_subcommand_desc2_t 
        "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n"
        "in a 'dumpfile' portable format.  If only LOWER is given, dump that\n"
        "one revision.\n"),
-    { 'r', 'q', opt_config_dir, opt_config_option, opt_non_interactive,
-      opt_auth_username, opt_auth_password, opt_auth_nocache } },
+    { 'r', 'q', SVN_SVNRDUMP__BASE_OPTIONS } },
   { "load", load_cmd, { 0 },
     N_("usage: svnrdump load URL\n\n"
        "Load a 'dumpfile' given on stdin to a repository at remote URL.\n"),
-    { 'q', opt_config_dir, opt_config_option, opt_non_interactive,
-      opt_auth_username, opt_auth_password, opt_auth_nocache } },
+    { 'q', SVN_SVNRDUMP__BASE_OPTIONS } },
   { "help", 0, { "?", "h" },
     N_("usage: svnrdump help [SUBCOMMAND...]\n\n"
        "Describe the usage of this program or its subcommands.\n"),