diff options
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 18 | ||||
| -rw-r--r-- | src/app/config/tor_cmdline_mode.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index cc5bc88277..522c3b5728 100644 --- 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 36626bed54..b2c43bbb87 100644 --- 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. */ |