[tor-commits] [tor/master] Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.

[nickm at torproject.org]

commit 6b0c443dde31f57f00c36ef4d53bd85bdfef8d79
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Mon Apr 6 22:05:27 2015 +0300

    Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
---
 src/or/config.c |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index ddd20ee..825bd18 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1878,23 +1878,23 @@ static const struct {
   const char *name;
   takes_argument_t takes_argument;
 } CMDLINE_ONLY_OPTIONS[] = {
-  { "-f",                     1 },
-  { "--allow-missing-torrc",  0 },
-  { "--defaults-torrc",       1 },
-  { "--hash-password",        1 },
+  { "-f",                     ARGUMENT_NECESSARY },
+  { "--allow-missing-torrc",  TAKES_NO_ARGUMENT },
+  { "--defaults-torrc",       ARGUMENT_NECESSARY },
+  { "--hash-password",        ARGUMENT_NECESSARY },
   { "--dump-config",          ARGUMENT_OPTIONAL },
-  { "--list-fingerprint",     0 },
-  { "--verify-config",        0 },
-  { "--ignore-missing-torrc", 0 },
-  { "--quiet",                0 },
-  { "--hush",                 0 },
-  { "--version",              0 },
-  { "--library-versions",     0 },
-  { "-h",                     0 },
-  { "--help",                 0 },
-  { "--list-torrc-options",   0 },
-  { "--nt-service",           0 },
-  { "-nt-service",            0 },
+  { "--list-fingerprint",     TAKES_NO_ARGUMENT },
+  { "--verify-config",        TAKES_NO_ARGUMENT },
+  { "--ignore-missing-torrc", TAKES_NO_ARGUMENT },
+  { "--quiet",                TAKES_NO_ARGUMENT },
+  { "--hush",                 TAKES_NO_ARGUMENT },
+  { "--version",              TAKES_NO_ARGUMENT },
+  { "--library-versions",     TAKES_NO_ARGUMENT },
+  { "-h",                     TAKES_NO_ARGUMENT },
+  { "--help",                 TAKES_NO_ARGUMENT },
+  { "--list-torrc-options",   TAKES_NO_ARGUMENT },
+  { "--nt-service",           TAKES_NO_ARGUMENT },
+  { "-nt-service",            TAKES_NO_ARGUMENT },
   { NULL, 0 },
 };