intel-virtual-output: mute spurious warnings
authorKirill Müller <kirill.mueller@ivt.baug.ethz.ch>
Tue, 26 Nov 2013 10:36:54 +0000 (11:36 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 26 Nov 2013 10:52:18 +0000 (10:52 +0000)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72027

tools/virtual.c

index 3ee9cd0..dd938a0 100644 (file)
@@ -355,7 +355,9 @@ static void context_enable_timer(struct context *ctx)
        if (ctx->timer_active)
                return;
 
-       read(ctx->timer, &count, sizeof(count));
+       /* reset timer */
+       count = read(ctx->timer, &count, sizeof(count));
+
        ctx->timer_active = 1;
 }
 
@@ -752,6 +754,7 @@ static void init_image(struct clone *clone)
 
        ret = XInitImage(image);
        assert(ret);
+       (void)ret;
 }
 
 static int mode_height(const XRRModeInfo *mode, Rotation rotation)
@@ -1159,13 +1162,17 @@ err:
                             DisplayString(dst->dpy), dst->name,
                             dst->x, dst->y, dst->mode.width, dst->mode.height,
                             dst->rotation, (long)rr_crtc));
+
                        ret = XRRSetCrtcConfig(dst->dpy, res, rr_crtc, CurrentTime,
                                               dst->x, dst->y, dst->mode.id, dst->rotation,
                                               &dst->rr_output, 1);
                        DBG(("%s-%s: XRRSetCrtcConfig %s\n", DisplayString(dst->dpy), dst->name, ret ? "failed" : "success"));
+
                        ret = XRRSetPanning(dst->dpy, res, rr_crtc, memset(&panning, 0, sizeof(panning)));
                        DBG(("%s-%s: XRRSetPanning %s\n", DisplayString(dst->dpy), dst->name, ret ? "failed" : "success"));
+
                        dst->rr_crtc = rr_crtc;
+                       (void)ret;
                }
                XUngrabServer(display->dpy);