From 27425f2efeeaced3d7d23960fa3206434de4fd0e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed, 14 Sep 2011 18:23:33 -0500
Subject: Remove some unused variables

driver.c:553:9: warning: unused variable 'rc' [-Wunused-variable]
    int rc;
        ^
input.c:188:18: warning: unused variable 'pInfo' [-Wunused-variable]
    InputInfoPtr pInfo = device->public.devicePrivate;
                 ^
input.c:210:26: warning: unused variable 'pNestedInput' [-Wunused-variable]
    NestedInputDevicePtr pNestedInput = pInfo->private;
                         ^
2 warnings generated.

xlibclient.c:272:11: warning: unused variable 'msg' [-Wunused-variable]
    char *msg = "Cursor";
          ^
xlibclient.c:273:11: warning: unused variable 'msg2' [-Wunused-variable]
    char *msg2 = "Root";
          ^
2 warnings generated.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
---
 src/driver.c     | 1 -
 src/input.c      | 3 ---
 src/xlibclient.c | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/driver.c b/src/driver.c
index 6189fe2..b01028f 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -548,7 +548,6 @@ Bool
 NestedAddMode(ScrnInfoPtr pScrn, int width, int height) {
     DisplayModePtr mode;
     char nameBuf[64];
-    int rc;
     size_t len;
 
     if (snprintf(nameBuf, 64, "%dx%d", width, height) >= 64)
diff --git a/src/input.c b/src/input.c
index d4d701c..cb5cd5d 100644
--- a/src/input.c
+++ b/src/input.c
@@ -185,8 +185,6 @@ _nested_input_init_buttons(DeviceIntPtr device) {
 
 static int
 _nested_input_init_axes(DeviceIntPtr device) {
-    InputInfoPtr pInfo = device->public.devicePrivate;
-
     if (!InitValuatorClassDeviceStruct(device,
                                        NUM_MOUSE_AXES,
                                        (Atom*)GetMotionHistory, // Not sure about this.
@@ -207,7 +205,6 @@ _nested_input_init_axes(DeviceIntPtr device) {
 static int 
 NestedInputControl(DeviceIntPtr device, int what) {
     InputInfoPtr pInfo = device->public.devicePrivate;
-    NestedInputDevicePtr pNestedInput = pInfo->private;
 
     switch (what) {
         case DEVICE_INIT:
diff --git a/src/xlibclient.c b/src/xlibclient.c
index edb4ad5..a849253 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -269,8 +269,6 @@ NestedClientUpdateScreen(NestedClientPrivatePtr pPriv, int16_t x1,
 void
 NestedClientTimerCallback(NestedClientPrivatePtr pPriv) {
     XEvent ev;
-    char *msg = "Cursor";
-    char *msg2 = "Root";
 
     while(XCheckMaskEvent(pPriv->display, ~0, &ev)) {
         if (ev.type == Expose) {
-- 
cgit v1.2.3