Rename CMD_OTHER to CMD_IMMEDIATE

diff --git a/src/app/config/config.c b/src/app/config/config.c
index cc5bc882776ff3901222faf89a599f008c58d820..522c3b5728e92fe217c515d59947efc05b56d2ed 100644 (file)
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2494,25 +2494,25 @@ static const struct {
   { .name="--hush",
     .quiet=1 },
   { .name="--version",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1 },
   { .name="--list-modules",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1 },
   { .name="--library-versions",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1 },
   { .name="-h",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1 },
   { .name="--help",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1  },
   { .name="--list-torrc-options",
-    .command=CMD_OTHER,
+    .command=CMD_IMMEDIATE,
     .quiet=1 },
   { .name="--list-deprecated-options",
-    .command=CMD_OTHER },
+    .command=CMD_IMMEDIATE },
   { .name="--nt-service" },
   { .name="-nt-service" },
   { .name=NULL },
@@ -5321,8 +5321,8 @@ options_init_from_torrc(int argc, char **argv)
 
   int command = global_cmdline->command;
   const char *command_arg = global_cmdline->command_arg;
-  /* "Other" has already been handled by this point. */
-  tor_assert(command != CMD_OTHER);
+  /* "immediate" has already been handled by this point. */
+  tor_assert(command != CMD_IMMEDIATE);
 
   if (command == CMD_HASH_PASSWORD) {
     cf_defaults = tor_strdup("");

diff --git a/src/app/config/tor_cmdline_mode.h b/src/app/config/tor_cmdline_mode.h
index 36626bed54a0853f1b0119d457e77e673d93e087..b2c43bbb8784a241d5cfcb88bbaafb9693c421a0 100644 (file)
--- a/src/app/config/tor_cmdline_mode.h
+++ b/src/app/config/tor_cmdline_mode.h
@@ -24,8 +24,8 @@ typedef enum {
   CMD_DUMP_CONFIG, /**< Running --dump-config. */
   CMD_KEYGEN, /**< Running --keygen */
   CMD_KEY_EXPIRATION, /**< Running --key-expiration */
-  CMD_OTHER, /**< Special value: indicates a command that is handled
-              * immediately during configuration processing. */
+  CMD_IMMEDIATE, /**< Special value: indicates a command that is handled
+                  * immediately during configuration processing. */
   CMD_RUN_UNITTESTS, /**< Special value: indicates that we have entered
                       * the Tor code from the unit tests, not from the
                       * regular Tor binary at all. */

diff --git a/src/app/main/main.c b/src/app/main/main.c
index 95dccbee648cd6b988d638f943607a3742c77162..22694fdbbb4e03d7cb3a0f8166576d70cc61b12a 100644 (file)
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1339,7 +1339,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
     result = do_dump_config();
     break;
   case CMD_RUN_UNITTESTS: /* only set by test.c */
-  case CMD_OTHER: /* Handled in config.c */
+  case CMD_IMMEDIATE: /* Handled in config.c */
   default:
     log_warn(LD_BUG,"Illegal command number %d: internal error.",
              get_options()->command);

diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c
index 16dc72acc58bd24b1df51319508d39107c9d27e5..9351d968700d1122d9cc5568a2d15a55b69efca4 100644 (file)
--- a/src/app/main/ntmain.c
+++ b/src/app/main/ntmain.c
@@ -340,7 +340,7 @@ nt_service_main(void)
                "or --key-expiration) in NT service.");
         break;
       case CMD_RUN_UNITTESTS:
-      case CMD_OTHER:
+      case CMD_IMMEDIATE:
       default:
         log_err(LD_CONFIG, "Illegal command number %d: internal error.",
                 get_options()->command);