Changed the literal 9000 into "OPT_REFUSED_BASE".
authorWayne Davison <wayned@samba.org>
Sun, 22 Feb 2004 08:56:43 +0000 (08:56 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 22 Feb 2004 08:56:43 +0000 (08:56 +0000)
options.c

index afab0e2f7f7eb1aa4fd8a6af0079818f1fc8a09c..166faf85b24c94efbae5a0be01b9ca18b2c678f8 100644 (file)
--- a/options.c
+++ b/options.c
@@ -303,7 +303,8 @@ void usage(enum logcode F)
 enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
       OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-      OPT_READ_BATCH, OPT_WRITE_BATCH};
+      OPT_READ_BATCH, OPT_WRITE_BATCH,
+      OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
@@ -433,7 +434,7 @@ static void set_refuse_options(char *bp)
                                break;
                        }
                        if (strcmp(bp, op->longName) == 0) {
-                               op->val = (op - long_options) + 9000;
+                               op->val = (op - long_options)+OPT_REFUSED_BASE;
                                break;
                        }
                }
@@ -578,9 +579,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
                default:
                        /* A large opt value means that set_refuse_options()
-                        * turned this option off (opt-9000 is its index). */
-                       if (opt >= 9000) {
-                               struct poptOption *op = &long_options[opt-9000];
+                        * turned this option off (opt-BASE is its index). */
+                       if (opt >= OPT_REFUSED_BASE) {
+                               struct poptOption *op =
+                                   &long_options[opt-OPT_REFUSED_BASE];
                                int n = snprintf(err_buf, sizeof err_buf,
                                    "This server does not support --%s\n",
                                    op->longName) - 1;