summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2015-04-06 22:05:27 +0300
committerNick Mathewson <nickm@torproject.org>2015-04-07 14:09:41 -0400
commit6b0c443dde31f57f00c36ef4d53bd85bdfef8d79 (patch)
tree3e6b6cea0ff61b60fef685f87c018bc9564c1ca1 /src
parente89c200c47fdb6253ee99d3603e86a8f1bdbab8c (diff)
downloadtor-6b0c443dde31f57f00c36ef4d53bd85bdfef8d79.tar.gz
tor-6b0c443dde31f57f00c36ef4d53bd85bdfef8d79.zip
Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/or/config.c b/src/or/config.c
index ddd20ee889..825bd18b16 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 },
};