aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-19 02:36:11 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-19 02:36:11 -0400
commit94f85f216ae4b6196d2a3438bfaf328375ebaad6 (patch)
treeb47b9c81e3722e8c41d35ade6c844a9dd7ebc0a5 /src/or
parent891ccd3cd0690e83f1dc4dde7698c3bd9d7fe98d (diff)
downloadtor-94f85f216ae4b6196d2a3438bfaf328375ebaad6.tar.gz
tor-94f85f216ae4b6196d2a3438bfaf328375ebaad6.zip
Turn streq_opt into a generic strcmp_opt.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 86ccb92965..cc1561bca6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3864,12 +3864,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
static int
opt_streq(const char *s1, const char *s2)
{
- if (!s1 && !s2)
- return 1;
- else if (s1 && s2 && !strcmp(s1,s2))
- return 1;
- else
- return 0;
+ return 0 == strcmp_opt(s1, s2);
}
/** Check if any of the previous options have changed but aren't allowed to. */