summaryrefslogtreecommitdiffstats
path: root/output/dbi
diff options
context:
space:
mode:
authorJeremy Sowden <jeremy@azazel.net>2021-11-30 10:55:34 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2021-11-30 20:55:17 +0100
commit721aa6f74f17f56dd82873aefffb2d6683918b79 (patch)
tree136aa49ccd4120647dd0c752d7585475691ce12a /output/dbi
parentc3176a3b5c129cbb94f7ff3f18b03d81f847cef3 (diff)
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>
Diffstat (limited to 'output/dbi')
-rw-r--r--output/dbi/ulogd_output_DBI.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/output/dbi/ulogd_output_DBI.c b/output/dbi/ulogd_output_DBI.c
index d2a9682..23cc9c8 100644
--- 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;