Use zalloc rather than malloc and manually setting members to 0

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Bryce Harrington 10 years ago committed by Pekka Paalanen
parent 2204492636
commit de44761a1a
  1. 5
      src/clipboard.c
  2. 9
      src/screenshooter.c

@ -214,9 +214,10 @@ clipboard_client_create(struct clipboard_source *source, int fd)
struct wl_event_loop *loop = struct wl_event_loop *loop =
wl_display_get_event_loop(seat->compositor->wl_display); wl_display_get_event_loop(seat->compositor->wl_display);
client = malloc(sizeof *client); client = zalloc(sizeof *client);
if (client == NULL)
return;
client->offset = 0;
client->source = source; client->source = source;
source->refcount++; source->refcount++;
client->event_source = client->event_source =

@ -481,7 +481,7 @@ weston_recorder_create(struct weston_output *output, const char *filename)
do_yflip = !!(compositor->capabilities & WESTON_CAP_CAPTURE_YFLIP); do_yflip = !!(compositor->capabilities & WESTON_CAP_CAPTURE_YFLIP);
recorder = malloc(sizeof *recorder); recorder = zalloc(sizeof *recorder);
if (recorder == NULL) { if (recorder == NULL) {
weston_log("%s: out of memory\n", __func__); weston_log("%s: out of memory\n", __func__);
return; return;
@ -491,9 +491,6 @@ weston_recorder_create(struct weston_output *output, const char *filename)
size = stride * 4 * output->current_mode->height; size = stride * 4 * output->current_mode->height;
recorder->frame = zalloc(size); recorder->frame = zalloc(size);
recorder->rect = malloc(size); recorder->rect = malloc(size);
recorder->total = 0;
recorder->count = 0;
recorder->destroying = 0;
recorder->output = output; recorder->output = output;
if ((recorder->frame == NULL) || (recorder->rect == NULL)) { if ((recorder->frame == NULL) || (recorder->rect == NULL)) {
@ -502,9 +499,7 @@ weston_recorder_create(struct weston_output *output, const char *filename)
return; return;
} }
if (do_yflip) if (!do_yflip)
recorder->tmpbuf = NULL;
else
recorder->tmpbuf = malloc(size); recorder->tmpbuf = malloc(size);
header.magic = WCAP_HEADER_MAGIC; header.magic = WCAP_HEADER_MAGIC;

Loading…
Cancel
Save