Module: Demos Branch: master Commit: f8ea370f14fd0efaf8cb600effed9c49df1785ec URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=f8ea370f14fd0efaf8cb600effed9c49df1785ec
Author: Brian <[email protected]> Date: Thu Jan 26 17:57:17 2012 +0100 xdemos: fix a bunch of unused variable warnings --- src/xdemos/glxcontexts.c | 6 +++--- src/xdemos/glxgears.c | 6 +++--- src/xdemos/glxgears_fbconfig.c | 6 +++--- src/xdemos/glxgears_pixmap.c | 6 +++--- src/xdemos/glxsnoop.c | 6 +++--- src/xdemos/glxswapcontrol.c | 6 +++--- src/xdemos/multictx.c | 6 +++--- src/xdemos/overlay.c | 8 ++------ 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/xdemos/glxcontexts.c b/src/xdemos/glxcontexts.c index 3467e3c..0f7f6d2 100644 --- a/src/xdemos/glxcontexts.c +++ b/src/xdemos/glxcontexts.c @@ -438,7 +438,7 @@ event_loop(Display *dpy) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event.xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -453,8 +453,8 @@ event_loop(Display *dpy) view_rotx -= 5.0; } else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return; diff --git a/src/xdemos/glxgears.c b/src/xdemos/glxgears.c index cff92b0..a9b4c0d 100644 --- a/src/xdemos/glxgears.c +++ b/src/xdemos/glxgears.c @@ -647,7 +647,7 @@ handle_event(Display *dpy, Window win, XEvent *event) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event->xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -662,8 +662,8 @@ handle_event(Display *dpy, Window win, XEvent *event) view_rotx -= 5.0; } else { - r = XLookupString(&event->xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event->xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return EXIT; diff --git a/src/xdemos/glxgears_fbconfig.c b/src/xdemos/glxgears_fbconfig.c index cffef28..8806dd1 100644 --- a/src/xdemos/glxgears_fbconfig.c +++ b/src/xdemos/glxgears_fbconfig.c @@ -525,7 +525,7 @@ event_loop(Display *dpy, GLXWindow win) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event.xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -540,8 +540,8 @@ event_loop(Display *dpy, GLXWindow win) view_rotx -= 5.0; } else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return; diff --git a/src/xdemos/glxgears_pixmap.c b/src/xdemos/glxgears_pixmap.c index 4b9e55a..f2bb013 100644 --- a/src/xdemos/glxgears_pixmap.c +++ b/src/xdemos/glxgears_pixmap.c @@ -436,7 +436,7 @@ event_loop(Display *dpy, struct gears *gears) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event.xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -451,8 +451,8 @@ event_loop(Display *dpy, struct gears *gears) view_rotx -= 5.0; } else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return; diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c index 2e95134..2215cfd 100644 --- a/src/xdemos/glxsnoop.c +++ b/src/xdemos/glxsnoop.c @@ -227,13 +227,13 @@ event_loop(Display *dpy, Window win) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event.xkey, 0); if (code == XK_Left) { } else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); keypress(dpy, win, buffer[0]); } } diff --git a/src/xdemos/glxswapcontrol.c b/src/xdemos/glxswapcontrol.c index 59a3e80..ff4a2dd 100644 --- a/src/xdemos/glxswapcontrol.c +++ b/src/xdemos/glxswapcontrol.c @@ -557,7 +557,7 @@ event_loop(Display *dpy, Window win) case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event.xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -572,8 +572,8 @@ event_loop(Display *dpy, Window win) view_rotx -= 5.0; } else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return; diff --git a/src/xdemos/multictx.c b/src/xdemos/multictx.c index 75255b2..0496eb2 100644 --- a/src/xdemos/multictx.c +++ b/src/xdemos/multictx.c @@ -472,7 +472,7 @@ handle_event(Display *dpy, Window win, GLXContext ctx1, GLXContext ctx2, case KeyPress: { char buffer[10]; - int r, code; + int code; code = XLookupKeysym(&event->xkey, 0); if (code == XK_Left) { view_roty += 5.0; @@ -487,8 +487,8 @@ handle_event(Display *dpy, Window win, GLXContext ctx1, GLXContext ctx2, view_rotx -= 5.0; } else { - r = XLookupString(&event->xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event->xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return EXIT; diff --git a/src/xdemos/overlay.c b/src/xdemos/overlay.c index 758f85c..4bf8019 100644 --- a/src/xdemos/overlay.c +++ b/src/xdemos/overlay.c @@ -146,11 +146,9 @@ MakeOverlayWindow(Display *dpy) None }; int scrnum; - Window root; XVisualInfo *visinfo; scrnum = DefaultScreen(dpy); - root = RootWindow(dpy, scrnum); visinfo = glXChooseVisual(dpy, scrnum, rgbAttribs); if (visinfo) { @@ -201,10 +199,8 @@ EventLoop(Display *dpy) case KeyPress: { char buffer[10]; - int r, code; - code = XLookupKeysym(&event.xkey, 0); - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); if (buffer[0] == 27) { /* escape */ return; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
