global: prefer sizeof(*pointer) when possible

Suggested-by: Sultan Alsawaf <sultanxda@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/src/config.c b/src/config.c
index 8e327bee676feadb681db801c50aaf2587a73a8a..93525fbb004f303f5b4efbb5427b21b7c223276a 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -310,7 +310,7 @@ static inline bool parse_allowedips(struct wgpeer *peer, struct wgallowedip **la
                saved_entry = strdup(mask);
                ip = strsep(&mask, "/");
 
-               new_allowedip = calloc(1, sizeof(struct wgallowedip));
+               new_allowedip = calloc(1, sizeof(*new_allowedip));
                if (!new_allowedip) {
                        perror("calloc");
                        free(saved_entry);
@@ -464,8 +464,8 @@ out:
 
 bool config_read_init(struct config_ctx *ctx, bool append)
 {
-       memset(ctx, 0, sizeof(struct config_ctx));
-       ctx->device = calloc(1, sizeof(struct wgdevice));
+       memset(ctx, 0, sizeof(*ctx));
+       ctx->device = calloc(1, sizeof(*ctx->device));
        if (!ctx->device) {
                perror("calloc");
                return false;
@@ -511,7 +511,7 @@ static char *strip_spaces(const char *in)
 
 struct wgdevice *config_read_cmd(char *argv[], int argc)
 {
-       struct wgdevice *device = calloc(1, sizeof(struct wgdevice));
+       struct wgdevice *device = calloc(1, sizeof(*device));
        struct wgpeer *peer = NULL;
        struct wgallowedip *allowedip = NULL;
 
@@ -537,7 +537,7 @@ struct wgdevice *config_read_cmd(char *argv[], int argc)
                        argv += 2;
                        argc -= 2;
                } else if (!strcmp(argv[0], "peer") && argc >= 2) {
-                       struct wgpeer *new_peer = calloc(1, sizeof(struct wgpeer));
+                       struct wgpeer *new_peer = calloc(1, sizeof(*new_peer));
 
                        allowedip = NULL;
                        if (!new_peer) {

diff --git a/src/ipc.c b/src/ipc.c
index 06590e2259cdcfda7751583e92eaa735d83889d7..e3ef789c3fa608363cf0b10f5089c1979128078c 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -294,7 +294,7 @@ static int userspace_get_device(struct wgdevice **out, const char *interface)
        FILE *f;
        int ret = -EPROTO;
 
-       *out = dev = calloc(1, sizeof(struct wgdevice));
+       *out = dev = calloc(1, sizeof(*dev));
        if (!dev)
                return -errno;
 
@@ -332,7 +332,7 @@ static int userspace_get_device(struct wgdevice **out, const char *interface)
                        dev->fwmark = NUM(0xffffffffU);
                        dev->flags |= WGDEVICE_HAS_FWMARK;
                } else if (!strcmp(key, "public_key")) {
-                       struct wgpeer *new_peer = calloc(1, sizeof(struct wgpeer));
+                       struct wgpeer *new_peer = calloc(1, sizeof(*new_peer));
 
                        if (!new_peer) {
                                ret = -ENOMEM;
@@ -398,7 +398,7 @@ static int userspace_get_device(struct wgdevice **out, const char *interface)
 
                        if (!mask || !isdigit(mask[0]))
                                break;
-                       new_allowedip = calloc(1, sizeof(struct wgallowedip));
+                       new_allowedip = calloc(1, sizeof(*new_allowedip));
                        if (!new_allowedip) {
                                ret = -ENOMEM;
                                goto err;
@@ -708,7 +708,7 @@ static int parse_allowedip(const struct nlattr *attr, void *data)
 static int parse_allowedips(const struct nlattr *attr, void *data)
 {
        struct wgpeer *peer = data;
-       struct wgallowedip *new_allowedip = calloc(1, sizeof(struct wgallowedip));
+       struct wgallowedip *new_allowedip = calloc(1, sizeof(*new_allowedip));
        int ret;
 
        if (!new_allowedip) {
@@ -787,7 +787,7 @@ static int parse_peer(const struct nlattr *attr, void *data)
 static int parse_peers(const struct nlattr *attr, void *data)
 {
        struct wgdevice *device = data;
-       struct wgpeer *new_peer = calloc(1, sizeof(struct wgpeer));
+       struct wgpeer *new_peer = calloc(1, sizeof(*new_peer));
        int ret;
 
        if (!new_peer) {
@@ -886,7 +886,7 @@ static int kernel_get_device(struct wgdevice **device, const char *interface)
        struct mnlg_socket *nlg;
 
 try_again:
-       *device = calloc(1, sizeof(struct wgdevice));
+       *device = calloc(1, sizeof(**device));
        if (!*device)
                return -errno;
 

diff --git a/src/show.c b/src/show.c
index b7f665c823e7ccb1bec4eebac104c3e46b724a99..9f98286a513f728200e5fc2242d189a3ccd1a398 100644 (file)
--- a/src/show.c
+++ b/src/show.c
@@ -53,12 +53,12 @@ static void sort_peers(struct wgdevice *device)
                ++peer_count;
        if (!peer_count)
                return;
-       peers = calloc(peer_count, sizeof(struct wgpeer *));
+       peers = calloc(peer_count, sizeof(*peers));
        if (!peers)
                return;
        for_each_wgpeer(device, peer)
                peers[i++] = peer;
-       qsort(peers, peer_count, sizeof(struct wgpeer *), peer_cmp);
+       qsort(peers, peer_count, sizeof(*peers), peer_cmp);
        device->first_peer = peers[0];
        peers[0]->next_peer = NULL;
        for (i = 1; i < peer_count; ++i) {