Mercurial > dovecot > core-2.2
changeset 19823:34733f49f6e2
doveadm: Code cleanup - remove unnecessary NULL sets and checks
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 22 Feb 2016 21:24:06 +0200 |
| parents | 554ef83e133c |
| children | 533b0cebf685 |
| files | src/doveadm/client-connection-http.c src/doveadm/doveadm-cmd.c |
| diffstat | 2 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/client-connection-http.c Mon Feb 22 21:17:26 2016 +0200 +++ b/src/doveadm/client-connection-http.c Mon Feb 22 21:24:06 2016 +0200 @@ -138,7 +138,6 @@ http_server_request_unref(&(conn->http_server_request)); http_server_switch_ioloop(doveadm_http_server); http_server_connection_unref(&(conn->http_client)); - conn->http_client = NULL; } static void doveadm_http_server_json_error(void *context, const char *error) @@ -330,7 +329,6 @@ } is = iostream_temp_finish(&doveadm_print_ostream, 4096); - doveadm_print_ostream = NULL; if (conn->first_row == TRUE) { conn->first_row = FALSE; @@ -374,9 +372,7 @@ } if (type != JSON_TYPE_ARRAY) break; conn->method_err = 0; - if (conn->method_id != NULL) - p_free(conn->client.pool, conn->method_id); - conn->method_id = NULL; + p_free_and_null(conn->client.pool, conn->method_id); conn->cmd = NULL; array_clear(&conn->pargv); conn->json_state = JSON_STATE_COMMAND_NAME; @@ -464,9 +460,7 @@ if (!conn->client.input->eof && rc == 0) return; - io_remove(&conn->client.io); - conn->client.io = NULL; if (rc == -2 || (rc == 1 && conn->json_state != JSON_STATE_DONE)) { /* this will happen if the parser above runs into unexpected element, but JSON is OK */ @@ -491,11 +485,7 @@ i_info("doveadm(%s): %s", i_stream_get_name(conn->client.input), error); return; } - - conn->json_parser = NULL; - - if (conn->client.output != NULL) - o_stream_nsend_str(conn->client.output,"]"); + o_stream_nsend_str(conn->client.output,"]"); doveadm_http_server_process_request(conn); }
--- a/src/doveadm/doveadm-cmd.c Mon Feb 22 21:17:26 2016 +0200 +++ b/src/doveadm/doveadm-cmd.c Mon Feb 22 21:24:06 2016 +0200 @@ -330,11 +330,7 @@ } break; case CMD_PARAM_STR: - if (value != NULL) { - param->value.v_string = p_strdup(pool, value); - } else { - param->value.v_string = NULL; - } + param->value.v_string = p_strdup(pool, value); break; case CMD_PARAM_ARRAY: if (!array_is_created(¶m->value.v_array))