Commit 385853a2 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix/annotate deadcode for CID 402,403

parent 134ac805

src/or/control.c

+22 −22
Original line number Diff line number Diff line
@@ -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);



  if (retval != SETOPT_OK) {

  if (retval != SETOPT_OK)

    log_warn(LD_CONTROL,

             "Controller gave us config file that didn't validate: %s",

             errstring);



  switch (retval) {

  case SETOPT_ERR_PARSE:

    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";

    break;

  case SETOPT_OK:

        tor_fragile_assert();

    break;

  }

  if (msg) {

    if (*errstring)

      connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring);

    else

      connection_printf_to_buf(conn, "%s\r\n", msg);

    tor_free(errstring);

    return 0;

  }

  } else {

    send_control_done(conn);

  }

  return 0;

}

src/or/hibernate.c

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ accounting_parse_options(or_options_t *options, int validate_only) 
  case UNIT_DAY:

    d = 0;

    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:

    tor_assert(0);

  }