Browse Source

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.)
Nick Mathewson 15 years ago
parent
commit
d66c379765
1 changed files with 5 additions and 6 deletions
  1. 5 6
      src/or/config.c

+ 5 - 6
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) {