nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix/annotate deadcode for CID 402,403

Browse Source
This commit is contained in:
Nick Mathewson 2009-10-26 22:35:29 -04:00
parent 134ac8059b
commit 385853a282
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/control.c
View File

@ -830,10 +830,11 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len,
retval = options_init_from_string(body, CMD_RUN_TOR, NULL, &errstring); retval = options_init_from_string(body, CMD_RUN_TOR, NULL, &errstring);
if (retval != SETOPT_OK) { if (retval != SETOPT_OK)
log_warn(LD_CONTROL, log_warn(LD_CONTROL,
"Controller gave us config file that didn't validate: %s", "Controller gave us config file that didn't validate: %s",
errstring); errstring);
switch (retval) { switch (retval) {
case SETOPT_ERR_PARSE: case SETOPT_ERR_PARSE:
msg = "552 Invalid config file"; msg = "552 Invalid config file";
@ -849,17 +850,16 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len,
msg = "550 Unable to load config"; msg = "550 Unable to load config";
break; break;
case SETOPT_OK: case SETOPT_OK:
tor_fragile_assert();
break; break;
} }
if (msg) {
if (*errstring) if (*errstring)
connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring); connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring);
else else
connection_printf_to_buf(conn, "%s\r\n", msg); connection_printf_to_buf(conn, "%s\r\n", msg);
tor_free(errstring); } else {
return 0;
}
send_control_done(conn); send_control_done(conn);
}
return 0; return 0;
} }

3
src/or/hibernate.c
View File

@ -182,6 +182,9 @@ accounting_parse_options(or_options_t *options, int validate_only)
case UNIT_DAY: case UNIT_DAY:
d = 0; d = 0;
break; break;
/* Coverity dislikes unreachable default cases; some compilers warn on
* switch statements missing a case. Tell Coverity not to worry. */
/* coverity[dead_error_begin] */
default: default:
tor_assert(0); tor_assert(0);
} }