Use zalloc instead of malloc + memset

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Jonas Ådahl 2015-08-26 12:00:06 +08:00
parent 3de1783e50
commit 2e7fb78682
5 changed files with 15 additions and 18 deletions

View file

@ -331,12 +331,10 @@ proxy_create(struct wl_proxy *factory, const struct wl_interface *interface)
struct wl_proxy *proxy;
struct wl_display *display = factory->display;
proxy = malloc(sizeof *proxy);
proxy = zalloc(sizeof *proxy);
if (proxy == NULL)
return NULL;
memset(proxy, 0, sizeof *proxy);
proxy->object.interface = interface;
proxy->display = display;
proxy->queue = factory->queue;
@ -387,12 +385,10 @@ wl_proxy_create_for_id(struct wl_proxy *factory,
struct wl_proxy *proxy;
struct wl_display *display = factory->display;
proxy = malloc(sizeof *proxy);
proxy = zalloc(sizeof *proxy);
if (proxy == NULL)
return NULL;
memset(proxy, 0, sizeof *proxy);
proxy->object.interface = interface;
proxy->object.id = id;
proxy->display = display;
@ -817,14 +813,12 @@ wl_display_connect_to_fd(int fd)
if (debug && (strstr(debug, "client") || strstr(debug, "1")))
debug_client = 1;
display = malloc(sizeof *display);
display = zalloc(sizeof *display);
if (display == NULL) {
close(fd);
return NULL;
}
memset(display, 0, sizeof *display);
display->fd = fd;
wl_map_init(&display->objects, WL_MAP_CLIENT_SIDE);
wl_event_queue_init(&display->default_queue, display);