From 9a2735c2b74d63e7495268e3c9595912d00314c8 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 6 Dec 2017 11:22:16 -0600 Subject: [PATCH] connection: Don't declare a local variable just to takes its size We can sizeof the struct type instead of declaring a pointer and taking the size of what it points to. Signed-off-by: Derek Foreman Reviewed-by: Daniel Stone --- src/connection.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/connection.c b/src/connection.c index e60ad75f..d029914a 100644 --- a/src/connection.c +++ b/src/connection.c @@ -632,7 +632,7 @@ wl_connection_demarshal(struct wl_connection *connection, const char *signature; struct argument_details arg; struct wl_closure *closure; - struct wl_array *array, *array_extra; + struct wl_array *array_extra; count = arg_count_for_signature(message->signature); if (count > WL_CLOSURE_MAX_ARGS) { @@ -643,7 +643,8 @@ wl_connection_demarshal(struct wl_connection *connection, } num_arrays = wl_message_count_arrays(message); - closure = malloc(sizeof *closure + size + num_arrays * sizeof *array); + closure = malloc(sizeof *closure + size + + num_arrays * sizeof(struct wl_array)); if (closure == NULL) { errno = ENOMEM; wl_connection_consume(connection, size);