Replace malloc && memset by calloc

This only replaces occurrences where the newly allocated memory is
cleared completely afterwards, as in other cases it is a theoretical
performance hit although code would be cleaner this way.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: David Ahern <dsa@cumulusnetworks.com>

diff --git a/genl/genl.c b/genl/genl.c
index e33fafdf2f52484b95fa465a920dcaca97289134..747074b029a7b98626ba32b70e15dc2e3b7aded9 100644 (file)
--- a/genl/genl.c
+++ b/genl/genl.c
@@ -86,9 +86,8 @@ reg:
        return f;
 
 noexist:
-       f = malloc(sizeof(*f));
+       f = calloc(1, sizeof(*f));
        if (f) {
-               memset(f, 0, sizeof(*f));
                strncpy(f->name, str, 15);
                f->parse_genlopt = parse_nofopt;
                f->print_genlopt = print_nofopt;

diff --git a/lib/names.c b/lib/names.c
index 3b5b0b1e1201a0197ed1420bcb9f04a3bd5d3c6f..fbd6503f22d42e9c2ae17957e85f2808fa0ac82b 100644 (file)
--- a/lib/names.c
+++ b/lib/names.c
@@ -54,15 +54,12 @@ struct db_names *db_names_alloc(void)
 {
        struct db_names *db;
 
-       db = malloc(sizeof(*db));
+       db = calloc(1, sizeof(*db));
        if (!db)
                return NULL;
 
-       memset(db, 0, sizeof(*db));
-
        db->size = MAX_ENTRIES;
-       db->hash = malloc(sizeof(struct db_entry *) * db->size);
-       memset(db->hash, 0, sizeof(struct db_entry *) * db->size);
+       db->hash = calloc(db->size, sizeof(struct db_entry *));
 
        return db;
 }

diff --git a/misc/lnstat.c b/misc/lnstat.c
index 659a01bd699314bc4fff3685b867106db4bb4e24..863fd4d9f03f293230fee7d0618947c2ef2478dc 100644 (file)
--- a/misc/lnstat.c
+++ b/misc/lnstat.c
@@ -182,10 +182,8 @@ static struct table_hdr *build_hdr_string(struct lnstat_file *lnstat_files,
        static struct table_hdr th;
        int ofs = 0;
 
-       for (i = 0; i < HDR_LINES; i++) {
-               th.hdr[i] = malloc(HDR_LINE_LENGTH);
-               memset(th.hdr[i], 0, HDR_LINE_LENGTH);
-       }
+       for (i = 0; i < HDR_LINES; i++)
+               th.hdr[i] = calloc(1, HDR_LINE_LENGTH);
 
        for (i = 0; i < fps->num; i++) {
                char *cname, *fname = fps->params[i].lf->name;

diff --git a/misc/lnstat_util.c b/misc/lnstat_util.c
index d918151282f5510f0ce45a14ff29a96fec8cbe77..cc54598fe1bef3f6e7e022f149f05a5ced693521 100644 (file)
--- a/misc/lnstat_util.c
+++ b/misc/lnstat_util.c
@@ -173,15 +173,13 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
        struct lnstat_file *lf;
 
        /* allocate */
-       lf = malloc(sizeof(*lf));
+       lf = calloc(1, sizeof(*lf));
        if (!lf) {
                fprintf(stderr, "out of memory\n");
                return NULL;
        }
 
        /* initialize */
-       memset(lf, 0, sizeof(*lf));
-
        /* de->d_name is guaranteed to be <= NAME_MAX */
        strcpy(lf->basename, file);
        strcpy(lf->path, path);

diff --git a/tc/em_canid.c b/tc/em_canid.c
index 16f6ed5c0b7a4218c7ee8ddfe49aed425fa2a5e5..ceb64cb933f5126771bc52ea4055d7266eb8c04b 100644 (file)
--- a/tc/em_canid.c
+++ b/tc/em_canid.c
@@ -106,8 +106,8 @@ static int canid_parse_eopt(struct nlmsghdr *n, struct tcf_ematch_hdr *hdr,
        if (args == NULL)
                return PARSE_ERR(args, "canid: missing arguments");
 
-       rules.rules_raw = malloc(sizeof(struct can_filter) * rules.rules_capacity);
-       memset(rules.rules_raw, 0, sizeof(struct can_filter) * rules.rules_capacity);
+       rules.rules_raw = calloc(rules.rules_capacity,
+                                sizeof(struct can_filter));
 
        do {
                if (!bstrcmp(args, "sff")) {

diff --git a/tc/m_action.c b/tc/m_action.c
index 806fdd197965dd6f505aa7eff3b3fc2d2ff17324..24f8b5d855211891638eb764f8e140bbd0800aec 100644 (file)
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -126,9 +126,8 @@ noexist:
                goto restart_s;
        }
 #endif
-       a = malloc(sizeof(*a));
+       a = calloc(1, sizeof(*a));
        if (a) {
-               memset(a, 0, sizeof(*a));
                strncpy(a->id, "noact", 15);
                a->parse_aopt = parse_noaopt;
                a->print_aopt = print_noaopt;

diff --git a/tc/m_ipt.c b/tc/m_ipt.c
index 098f610f9439ae89a0ea4fe8127310597f2ace27..d6f62bd6b32c98aca862bf437c32205916a00f01 100644 (file)
--- a/tc/m_ipt.c
+++ b/tc/m_ipt.c
@@ -164,16 +164,11 @@ get_target_name(const char *name)
        return NULL;
 #endif
 
-       new_name = malloc(strlen(name) + 1);
-       lname = malloc(strlen(name) + 1);
-       if (new_name)
-               memset(new_name, '\0', strlen(name) + 1);
-       else
+       new_name = calloc(1, strlen(name) + 1);
+       lname = calloc(1, strlen(name) + 1);
+       if (!new_name)
                exit_error(PARAMETER_PROBLEM, "get_target_name");
-
-       if (lname)
-               memset(lname, '\0', strlen(name) + 1);
-       else
+       if (!lname)
                exit_error(PARAMETER_PROBLEM, "get_target_name");
 
        strcpy(new_name, name);

diff --git a/tc/m_pedit.c b/tc/m_pedit.c
index 141c30fb6fabc5aad2a1f5f64e98e455efc595ad..35879b7fb72e2458fc48c8174a001508db2c5061 100644 (file)
--- a/tc/m_pedit.c
+++ b/tc/m_pedit.c
@@ -107,9 +107,8 @@ reg:
        return p;
 
 noexist:
-       p = malloc(sizeof(*p));
+       p = calloc(1, sizeof(*p));
        if (p) {
-               memset(p, 0, sizeof(*p));
                strncpy(p->id, str, sizeof(p->id) - 1);
                p->parse_peopt = pedit_parse_nopopt;
                goto reg;

diff --git a/tc/tc.c b/tc/tc.c
index d0ddb939d4737430104fc1efeafa27f9debbb0f6..8e64a82b4271cf1800c2feabb24a28c31b765382 100644 (file)
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -133,11 +133,9 @@ reg:
        return q;
 
 noexist:
-       q = malloc(sizeof(*q));
+       q = calloc(1, sizeof(*q));
        if (q) {
-
-               memset(q, 0, sizeof(*q));
-               q->id = strcpy(malloc(strlen(str)+1), str);
+               q->id = strdup(str);
                q->parse_qopt = parse_noqopt;
                q->print_qopt = print_noqopt;
                goto reg;
@@ -177,9 +175,8 @@ reg:
        filter_list = q;
        return q;
 noexist:
-       q = malloc(sizeof(*q));
+       q = calloc(1, sizeof(*q));
        if (q) {
-               memset(q, 0, sizeof(*q));
                strncpy(q->id, str, 15);
                q->parse_fopt = parse_nofopt;
                q->print_fopt = print_nofopt;

diff --git a/tc/tc_bpf.c b/tc/tc_bpf.c
index 9073932702c538a9fbc6ae46c4ff7e6812ab4f21..b390f7e2b1523f2004d3da20d4bce48f0ae8185b 100644 (file)
--- a/tc/tc_bpf.c
+++ b/tc/tc_bpf.c
@@ -112,12 +112,10 @@ static int bpf_parse_string(char *arg, bool from_file, __u16 *bpf_len,
                FILE *fp;
 
                tmp_len = sizeof("4096,") + BPF_MAXINSNS * op_len;
-               tmp_string = malloc(tmp_len);
+               tmp_string = calloc(1, tmp_len);
                if (tmp_string == NULL)
                        return -ENOMEM;
 
-               memset(tmp_string, 0, tmp_len);
-
                fp = fopen(arg, "r");
                if (fp == NULL) {
                        perror("Cannot fopen");

diff --git a/tc/tc_class.c b/tc/tc_class.c
index ee9e945acac11c777e8a6dc68ab3be826e3956f5..1690ec1bbfad86960868c0dbd68c54ad8726030c 100644 (file)
--- a/tc/tc_class.c
+++ b/tc/tc_class.c
@@ -163,9 +163,8 @@ __u32 filter_classid;
 static void graph_node_add(__u32 parent_id, __u32 id, void *data,
                int len)
 {
-       struct graph_node *node = malloc(sizeof(struct graph_node));
+       struct graph_node *node = calloc(1, sizeof(struct graph_node));
 
-       memset(node, 0, sizeof(*node));
        node->id         = id;
        node->parent_id  = parent_id;
 

diff --git a/tc/tc_exec.c b/tc/tc_exec.c
index f69b6ba9f6b7e1fb4020c9ab6635e863cbe557ed..d23a825dbddf92c9364f13ccc0935bdf78aec825 100644 (file)
--- a/tc/tc_exec.c
+++ b/tc/tc_exec.c
@@ -71,9 +71,8 @@ reg:
 
        return eu;
 noexist:
-       eu = malloc(sizeof(*eu));
+       eu = calloc(1, sizeof(*eu));
        if (eu) {
-               memset(eu, 0, sizeof(*eu));
                strncpy(eu->id, name, sizeof(eu->id) - 1);
                eu->parse_eopt = parse_noeopt;
                goto reg;