mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use xmalloc in desktop-shell.c

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-07-25 16:44:45 -07:00
parent 87d38418a1
commit b886212545
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+5 -7
View File
@@ -409,7 +409,7 @@ panel_add_clock(struct panel *panel)
return; return;
} }
clock = malloc(sizeof *clock); clock = xmalloc(sizeof *clock);
memset(clock, 0, sizeof *clock); memset(clock, 0, sizeof *clock);
clock->panel = panel; clock->panel = panel;
panel->clock = clock; panel->clock = clock;
@@ -512,7 +512,7 @@ panel_create(struct desktop *desktop)
struct panel *panel; struct panel *panel;
struct weston_config_section *s; struct weston_config_section *s;
panel = malloc(sizeof *panel); panel = xmalloc(sizeof *panel);
memset(panel, 0, sizeof *panel); memset(panel, 0, sizeof *panel);
panel->base.configure = panel_configure; panel->base.configure = panel_configure;
@@ -582,7 +582,7 @@ panel_add_launcher(struct panel *panel, const char *icon, const char *path)
char *start, *p, *eq, **ps; char *start, *p, *eq, **ps;
int i, j, k; int i, j, k;
launcher = malloc(sizeof *launcher); launcher = xmalloc(sizeof *launcher);
memset(launcher, 0, sizeof *launcher); memset(launcher, 0, sizeof *launcher);
launcher->icon = load_icon_or_fallback(icon); launcher->icon = load_icon_or_fallback(icon);
launcher->path = strdup(path); launcher->path = strdup(path);
@@ -841,9 +841,7 @@ unlock_dialog_create(struct desktop *desktop)
struct display *display = desktop->display; struct display *display = desktop->display;
struct unlock_dialog *dialog; struct unlock_dialog *dialog;
dialog = malloc(sizeof *dialog); dialog = xmalloc(sizeof *dialog);
if (!dialog)
return NULL;
memset(dialog, 0, sizeof *dialog); memset(dialog, 0, sizeof *dialog);
dialog->window = window_create_custom(display); dialog->window = window_create_custom(display);
@@ -989,7 +987,7 @@ background_create(struct desktop *desktop)
struct weston_config_section *s; struct weston_config_section *s;
char *type; char *type;
background = malloc(sizeof *background); background = xmalloc(sizeof *background);
memset(background, 0, sizeof *background); memset(background, 0, sizeof *background);
background->base.configure = background_configure; background->base.configure = background_configure;