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.)
This commit is contained in:
Nick Mathewson
2009-05-29 23:28:01 -04:00
parent e70fe116d3
commit d66c379765
+5 -6
View File
@@ -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) {