procd: Remove unnecessary memset calls.

Changes allocation to calloc and {} as needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/inittab.c b/inittab.c
index 21172f7c065cdc9474ca037398757e9b78b026a8..c27c3241f4e1b359eb69e7177f7ac633de7d5441 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -284,8 +284,7 @@ void procd_inittab(void)
 
        regcomp(&pat_inittab, "([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9]*):(.*)", REG_EXTENDED);
        line = malloc(LINE_LEN);
-       a = malloc(sizeof(struct init_action));
-       memset(a, 0, sizeof(struct init_action));
+       a = calloc(1, sizeof(struct init_action));
 
        while (fgets(line, LINE_LEN, fp)) {
                char *tags[TAG_PROCESS + 1];
@@ -322,8 +321,7 @@ void procd_inittab(void)
                if (add_action(a, tags[TAG_ACTION]))
                        continue;
                line = malloc(LINE_LEN);
-               a = malloc(sizeof(struct init_action));
-               memset(a, 0, sizeof(struct init_action));
+               a = calloc(1, sizeof(struct init_action));
        }
 
        fclose(fp);

diff --git a/plug/hotplug.c b/plug/hotplug.c
index ffedba242bf450c96484abdea3c4cfc05c0eb0fe..9fc19385d31da3bb598d27d0b88ce0b6337826eb 100644 (file)
--- a/plug/hotplug.c
+++ b/plug/hotplug.c
@@ -434,12 +434,10 @@ static void handle_button_complete(struct blob_attr *msg, struct blob_attr *data
        if (!name)
                return;
 
-       b = malloc(sizeof(*b));
+       b = calloc(1, sizeof(*b));
        if (!b)
                return;
 
-       memset(b, 0, sizeof(*b));
-
        b->data = malloc(blob_pad_len(data));
        b->name = strdup(name);
        b->seen = timeout;
@@ -584,11 +582,10 @@ void hotplug_last_event(uloop_timeout_handler handler)
 
 void hotplug(char *rules)
 {
-       struct sockaddr_nl nls;
+       struct sockaddr_nl nls = {};
        int nlbufsize = 512 * 1024;
 
        rule_file = strdup(rules);
-       memset(&nls,0,sizeof(struct sockaddr_nl));
        nls.nl_family = AF_NETLINK;
        nls.nl_pid = getpid();
        nls.nl_groups = -1;