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

multi-resource: Use xzmalloc() instead of malloc+memset and calloc

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-10-09 13:09:51 -07:00
parent 74b0d72817
commit b24d590e8f
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/multi-resource.c
+4 -14
View File
@@ -39,6 +39,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/os-compatibility.h" #include "../shared/os-compatibility.h"
#include "xmalloc.h"
struct device { struct device {
enum { KEYBOARD, POINTER } type; enum { KEYBOARD, POINTER } type;
@@ -140,10 +141,7 @@ create_window(struct display *display, int width, int height)
{ {
struct window *window; struct window *window;
window = calloc(1, sizeof *window); window = xzalloc(sizeof *window);
if (!window)
return NULL;
window->display = display; window->display = display;
window->width = width; window->width = width;
window->height = height; window->height = height;
@@ -226,12 +224,7 @@ create_display(void)
{ {
struct display *display; struct display *display;
display = malloc(sizeof *display); display = xzalloc(sizeof *display);
if (display == NULL) {
fprintf(stderr, "out of memory\n");
exit(1);
}
memset(display, 0, sizeof *display);
display->display = wl_display_connect(NULL); display->display = wl_display_connect(NULL);
assert(display->display); assert(display->display);
@@ -452,8 +445,7 @@ create_device(struct display *display, const char *time_desc, int type)
goto error; goto error;
} }
device = malloc(sizeof *device); device = xzalloc(sizeof *device);
memset(device, 0, sizeof(*device));
device->type = type; device->type = type;
device->start_time = start_time; device->start_time = start_time;
device->end_time = end_time; device->end_time = end_time;
@@ -552,8 +544,6 @@ main(int argc, char **argv)
display = create_display(); display = create_display();
window = create_window(display, 250, 250); window = create_window(display, 250, 250);
if (!window)
return 1;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (!strncmp(argv[i], "-p", 2)) { if (!strncmp(argv[i], "-p", 2)) {