From dc2998bf060957b1fdd6bd2ea4f76c5154233a1b Mon Sep 17 00:00:00 2001 From: Dima Ryazanov Date: Tue, 12 May 2015 10:21:19 -0700 Subject: [PATCH] xwayland: Remove a useless out-of-memory check snprintf does not allocate memory, so we can never get an out-of-memory error. (Also, the error handler would free xwl_output after it was already registered as an event listener.) Signed-off-by: Dima Ryazanov Reviewed-by: Marek Chalupa --- hw/xwayland/xwayland-output.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c index 7e5484c7d..dd169e806 100644 --- a/hw/xwayland/xwayland-output.c +++ b/hw/xwayland/xwayland-output.c @@ -167,11 +167,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id) &wl_output_interface, 2); wl_output_add_listener(xwl_output->output, &output_listener, xwl_output); - if (snprintf(name, sizeof name, "XWAYLAND%d", serial++) < 0) { - ErrorF("create_output ENOMEM\n"); - free(xwl_output); - return NULL; - } + snprintf(name, sizeof name, "XWAYLAND%d", serial++); xwl_output->xwl_screen = xwl_screen; xwl_output->randr_crtc = RRCrtcCreate(xwl_screen->screen, xwl_output);