From 263e1061ea03a10ba280ef820adf537ffd71f3c0 Mon Sep 17 00:00:00 2001 From: Mattias Hansson Date: Thu, 4 Apr 2019 11:42:49 +0200 Subject: jq_util_input_init: Zero memory using calloc Calloc will zero the allocated memory which makes one memset and a number of explicit zero assignments redundant. --- src/util.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/util.c b/src/util.c index c5bf5f22..1f2aac11 100644 --- a/src/util.c +++ b/src/util.c @@ -208,20 +208,11 @@ jq_util_input_state *jq_util_input_init(jq_util_msg_cb err_cb, void *err_cb_data err_cb = fprinter; err_cb_data = stderr; } - jq_util_input_state *new_state = jv_mem_alloc(sizeof(*new_state)); - memset(new_state, 0, sizeof(*new_state)); + jq_util_input_state *new_state = jv_mem_calloc(1, sizeof(*new_state)); new_state->err_cb = err_cb; new_state->err_cb_data = err_cb_data; - new_state->parser = NULL; - new_state->current_input = NULL; - new_state->files = NULL; - new_state->nfiles = 0; - new_state->curr_file = 0; new_state->slurped = jv_invalid(); - new_state->buf[0] = 0; - new_state->buf_valid_len = 0; new_state->current_filename = jv_invalid(); - new_state->current_line = 0; return new_state; } -- cgit v1.2.3