Replace malloc+memset with calloc

There are a number of places where we `malloc` some memory and then
`memset` it to zero.  Use `calloc` instead.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/output/dbi/ulogd_output_DBI.c b/output/dbi/ulogd_output_DBI.c
index d2a9682933142f28741acf3c8fb05cf42bbd0e62..23cc9c8fb4922ddb06175e5b40c65c00ea16457c 100644 (file)
--- a/output/dbi/ulogd_output_DBI.c
+++ b/output/dbi/ulogd_output_DBI.c
@@ -129,8 +129,7 @@ static int get_columns_dbi(struct ulogd_pluginstance *upi)
        upi->input.num_keys = dbi_result_get_numfields(pi->result);
        ulogd_log(ULOGD_DEBUG, "%u fields in table\n", upi->input.num_keys);
 
-       upi->input.keys = malloc(sizeof(struct ulogd_key) *
-                                               upi->input.num_keys);
+       upi->input.keys = calloc(upi->input.num_keys, sizeof(*upi->input.keys));
        if (!upi->input.keys) {
                upi->input.num_keys = 0;
                ulogd_log(ULOGD_ERROR, "ENOMEM\n");
@@ -138,9 +137,6 @@ static int get_columns_dbi(struct ulogd_pluginstance *upi)
                return -ENOMEM;
        }
 
-       memset(upi->input.keys, 0, sizeof(struct ulogd_key) *
-                                               upi->input.num_keys);
-
        for (ui=1; ui<=upi->input.num_keys; ui++) {
                char buf[ULOGD_MAX_KEYLEN+1];
                char *underscore;

diff --git a/output/ipfix/ipfix.c b/output/ipfix/ipfix.c
index 4bb432a73d14fa1ae4770f9ad9e79c91a9e7ed54..b2719fd1d8a376f60abcd9638c599e710c7ef35a 100644 (file)
--- a/output/ipfix/ipfix.c
+++ b/output/ipfix/ipfix.c
@@ -85,8 +85,7 @@ struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid, int tid)
            (len < IPFIX_HDRLEN + IPFIX_SET_HDRLEN))
                return NULL;
 
-       msg = malloc(sizeof(struct ipfix_msg) + len);
-       memset(msg, 0, sizeof(struct ipfix_msg));
+       msg = calloc(1, sizeof(struct ipfix_msg) + len);
        msg->tid = tid;
        msg->end = msg->data + len;
        msg->tail = msg->data + IPFIX_HDRLEN;
@@ -95,7 +94,6 @@ struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid, int tid)
 
        /* Initialize message header */
        hdr = ipfix_msg_hdr(msg);
-       memset(hdr, 0, IPFIX_HDRLEN);
        hdr->version = htons(IPFIX_VERSION);
        hdr->oid = htonl(oid);
 

diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c
index 643320ce724cb34c32e70c8b3af19679b6246bbc..66151feb4939af96e6d9e6f977fa303c966f3f0f 100644 (file)
--- a/output/mysql/ulogd_output_MYSQL.c
+++ b/output/mysql/ulogd_output_MYSQL.c
@@ -127,16 +127,12 @@ static int get_columns_mysql(struct ulogd_pluginstance *upi)
 
        upi->input.num_keys = mysql_num_fields(result);
        ulogd_log(ULOGD_DEBUG, "%u fields in table\n", upi->input.num_keys);
-       upi->input.keys = malloc(sizeof(struct ulogd_key) * 
-                                               upi->input.num_keys);
+       upi->input.keys = calloc(upi->input.num_keys, sizeof(*upi->input.keys));
        if (!upi->input.keys) {
                upi->input.num_keys = 0;
                ulogd_log(ULOGD_ERROR, "ENOMEM\n");
                return -ENOMEM;
        }
-       
-       memset(upi->input.keys, 0, sizeof(struct ulogd_key) *
-                                               upi->input.num_keys);
 
        for (i = 0; (field = mysql_fetch_field(result)); i++) {
                char buf[ULOGD_MAX_KEYLEN+1];

diff --git a/output/pgsql/ulogd_output_PGSQL.c b/output/pgsql/ulogd_output_PGSQL.c
index fda289eca7765ec0639745d157806b0f4dba52bb..f5a2823a7e1d46bf2df0b59170b3289d79f7227f 100644 (file)
--- a/output/pgsql/ulogd_output_PGSQL.c
+++ b/output/pgsql/ulogd_output_PGSQL.c
@@ -181,8 +181,7 @@ static int get_columns_pgsql(struct ulogd_pluginstance *upi)
 
        upi->input.num_keys = PQntuples(pi->pgres);
        ulogd_log(ULOGD_DEBUG, "%u fields in table\n", upi->input.num_keys);
-       upi->input.keys = malloc(sizeof(struct ulogd_key) *
-                                               upi->input.num_keys);
+       upi->input.keys = calloc(upi->input.num_keys, sizeof(*upi->input.keys));
        if (!upi->input.keys) {
                upi->input.num_keys = 0;
                ulogd_log(ULOGD_ERROR, "ENOMEM\n");
@@ -190,9 +189,6 @@ static int get_columns_pgsql(struct ulogd_pluginstance *upi)
                return -ENOMEM;
        }
 
-       memset(upi->input.keys, 0, sizeof(struct ulogd_key) *
-                                               upi->input.num_keys);
-
        for (i = 0; i < PQntuples(pi->pgres); i++) {
                char buf[ULOGD_MAX_KEYLEN+1];
                char *underscore;

diff --git a/src/ulogd.c b/src/ulogd.c
index 97da4fc0018ff0c096c15cb998d5f82e2bd142db..b02f2602a895d8e7d0e21ef6ef6665e8689f8dac 100644 (file)
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -661,12 +661,11 @@ pluginstance_alloc_init(struct ulogd_plugin *pl, char *pi_id,
        }
        size += pl->input.num_keys * sizeof(struct ulogd_key);
        size += pl->output.num_keys * sizeof(struct ulogd_key);
-       pi = malloc(size);
+       pi = calloc(1, size);
        if (!pi)
                return NULL;
 
        /* initialize */
-       memset(pi, 0, size);
        INIT_LLIST_HEAD(&pi->list);
        INIT_LLIST_HEAD(&pi->plist);
        pi->plugin = pl;