From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 30 May 2009 03:28:01 +0000 (-0400)
Subject: Clean up a bit of C logic, and fix an erroneous warning.
X-Git-Tag: tor-0.2.1.16-rc~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d66c3797650698778bd098bbaf9d3bbeebfa9fcf;p=thirdparty%2Ftor.git

Clean up a bit of C logic, and fix an erroneous warning.

(Simplify "if (cond) return 1; return 0;" to "return cond;", and don't
give a warning when we start with accounting on but dirport off.)
---

diff --git a/src/or/config.c b/src/or/config.c
index 5bf3fd41b5..81999516dd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2634,12 +2634,11 @@ is_listening_on_low_port(uint16_t port_option,
 #else
   const config_line_t *l;
   uint16_t p;
-  if (listen_options == NULL) {
-    if (port_option < 1024) {
-      return 1;
-    }
-    return 0;
-  }
+  if (port_option == 0)
+    return 0; /* We're not listening */
+  if (listen_options == NULL)
+    return (port_option < 1024);
+
   for (l = listen_options; l; l = l->next) {
     parse_addr_port(LOG_WARN, l->value, NULL, NULL, &p);
     if (p<1024) {