Use [x]zalloc instead of [x]malloc + memset

Signed-off-by: Ryo Munakata <ryomnktml@gmail.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
dev
Ryo Munakata 9 years ago committed by Bryce Harrington
parent b18f788e2e
commit 5e653caa4a
  1. 3
      clients/editor.c
  2. 6
      clients/subsurfaces.c
  3. 9
      fullscreen-shell/fullscreen-shell.c

@ -687,8 +687,7 @@ text_entry_create(struct editor *editor, const char *text)
{
struct text_entry *entry;
entry = xmalloc(sizeof *entry);
memset(entry, 0, sizeof *entry);
entry = xzalloc(sizeof *entry);
entry->widget = widget_add_widget(editor->widget, entry);
entry->window = editor->window;

@ -498,8 +498,7 @@ triangle_create(struct window *window, struct egl_state *egl)
{
struct triangle *tri;
tri = xmalloc(sizeof *tri);
memset(tri, 0, sizeof *tri);
tri = xzalloc(sizeof *tri);
tri->egl = egl;
tri->widget = window_add_subsurface(window, tri,
@ -720,8 +719,7 @@ demoapp_create(struct display *display)
{
struct demoapp *app;
app = xmalloc(sizeof *app);
memset(app, 0, sizeof *app);
app = xzalloc(sizeof *app);
app->egl = egl_state_create(display_get_display(display));

@ -142,10 +142,9 @@ seat_created(struct wl_listener *l, void *data)
struct weston_seat *seat = data;
struct pointer_focus_listener *listener;
listener = malloc(sizeof *listener);
listener = zalloc(sizeof *listener);
if (!listener)
return;
memset(listener, 0, sizeof *listener);
listener->shell = container_of(l, struct fullscreen_shell,
seat_created_listener);
@ -251,10 +250,9 @@ fs_output_create(struct fullscreen_shell *shell, struct weston_output *output)
{
struct fs_output *fsout;
fsout = malloc(sizeof *fsout);
fsout = zalloc(sizeof *fsout);
if (!fsout)
return NULL;
memset(fsout, 0, sizeof *fsout);
fsout->shell = shell;
wl_list_insert(&shell->output_list, &fsout->link);
@ -805,11 +803,10 @@ module_init(struct weston_compositor *compositor,
struct weston_seat *seat;
struct weston_output *output;
shell = malloc(sizeof *shell);
shell = zalloc(sizeof *shell);
if (shell == NULL)
return -1;
memset(shell, 0, sizeof *shell);
shell->compositor = compositor;
shell->client_destroyed.notify = client_destroyed;

Loading…
Cancel
Save