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

simple-dmabuf-drm: don't exit from create_display

Browse Source 
Only exit from main so control flow is in one place.

Signed-off-by: Guido Günther <agx@sigxcpu.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Guido Günther
2018-03-20 11:36:37 +01:00
committed by Pekka Paalanen
parent f7d035b28c
commit 577b346412
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-dmabuf-drm.c
+5 -3
View File
@@ -828,7 +828,7 @@ create_display(int opts, int format)
display = malloc(sizeof *display); display = malloc(sizeof *display);
if (display == NULL) { if (display == NULL) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
exit(1); return NULL;
} }
display->display = wl_display_connect(NULL); display->display = wl_display_connect(NULL);
assert(display->display); assert(display->display);
@@ -851,7 +851,7 @@ create_display(int opts, int format)
wl_display_roundtrip(display->display); wl_display_roundtrip(display->display);
if (display->dmabuf == NULL) { if (display->dmabuf == NULL) {
fprintf(stderr, "No zwp_linux_dmabuf global\n"); fprintf(stderr, "No zwp_linux_dmabuf global\n");
exit(1); return NULL;
} }
wl_display_roundtrip(display->display); wl_display_roundtrip(display->display);
@@ -860,7 +860,7 @@ create_display(int opts, int format)
(format == DRM_FORMAT_NV12 && (!display->nv12_format_found || (format == DRM_FORMAT_NV12 && (!display->nv12_format_found ||
!display->nv12_modifier_found))) { !display->nv12_modifier_found))) {
fprintf(stderr, "requested format is not available\n"); fprintf(stderr, "requested format is not available\n");
exit(1); return NULL;
} }
return display; return display;
@@ -970,6 +970,8 @@ main(int argc, char **argv)
} }
display = create_display(opts, import_format); display = create_display(opts, import_format);
if (!display)
return 1;
window = create_window(display, 256, 256, import_format, opts); window = create_window(display, 256, 256, import_format, opts);
if (!window) if (!window)
return 1; return 1;