xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-output.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit dc2998bf060957b1fdd6bd2ea4f76c5154233a1b
Author: Dima Ryazanov <dima at gmail.com>
Date:   Tue May 12 10:21:19 2015 -0700

    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 <dima at gmail.com>
    Reviewed-by: Marek Chalupa <mchqwerty at gmail.com>

diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 7e5484c..dd169e8 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);