diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2010-04-18 17:34:27 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2010-04-20 09:55:55 -0700 |
| commit | 4c32692b4acfb02d8ef9ebbe0b999a2a59bc2fd7 (patch) | |
| tree | a614f41cc9a58538a8dccb6d484f823f6ef90452 | |
| parent | c4049fde7c2074085a6079b780cb48bdc3a58bc4 (diff) | |
xts5: Fix "unused variable" warnings.
There are still two left:
XDrawRectangle/XDrawRectangle.c:4211: warning: unused variable ‘jssav’
XDrawRectangles/XDrawRectangles.c:4292: warning: unused variable ‘jssav’
These are a little harder to fix because the declaration is generated but jssav
is only used in some of the tests.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
236 files changed, 189 insertions, 902 deletions
diff --git a/xts5/XI/AllowDeviceEvents.m b/xts5/XI/AllowDeviceEvents.m index 1b5d6a7c..47114013 100644 --- a/xts5/XI/AllowDeviceEvents.m +++ b/xts5/XI/AllowDeviceEvents.m @@ -174,11 +174,8 @@ static Bool ispfrozen(disp) Display *disp; { -int i, axisval=0, ret=True; -XDeviceState *state; -XInputClass *data; +int axisval=0, ret=True; XEvent ev; -Window w; XSync(display, True); /* Flush previous events */ SimulateDeviceMotionEvent(display, Devs.Button, False, 1, &axisval, 0); @@ -1367,7 +1364,6 @@ mode is invalid. Invoke xname with an invalid mode. Verify BadValue >>CODE BadValue -Display *client2; int ret; if (!grabstartup()) diff --git a/xts5/XI/ChangeDeviceControl.m b/xts5/XI/ChangeDeviceControl.m index 5808a17b..92f56d67 100644 --- a/xts5/XI/ChangeDeviceControl.m +++ b/xts5/XI/ChangeDeviceControl.m @@ -369,8 +369,7 @@ Do a valid ChangeDeviceControl request, specifying DEVICE_RESOLUTION, and resolutions beyond the minimum and maximum allowed. Verify that a BadValue error occurs. >>CODE BadValue -int ret, i,j,k, count=0, ndevices; -XDeviceResolutionState *state; +int ret, i, j, k, ndevices; XAnyClassPtr any; XDeviceInfo *list; @@ -419,8 +418,7 @@ Do a valid ChangeDeviceControl request, specifying DEVICE_RESOLUTION, and a device with valuators that does not support having its resolution changed >>CODE BadMatch -int ret, i,j,k, count=0, ndevices; -XDeviceResolutionState *state; +int ret, i,j,k, ndevices; XAnyClassPtr any; XDeviceInfo *list; diff --git a/xts5/XI/ChangeFeedbackControl.m b/xts5/XI/ChangeFeedbackControl.m index 1197db13..febb9342 100644 --- a/xts5/XI/ChangeFeedbackControl.m +++ b/xts5/XI/ChangeFeedbackControl.m @@ -569,7 +569,6 @@ If the device has no feedbacks, we will get a BadMatch error. >>STRATEGY Do a ChangeFeedbackControl, specifying a device that has no feedbacks. >>CODE BadMatch -int i,j,k,ndevices,Nfeed; if (Setup_Extension_DeviceInfo(NFeedMask)) { @@ -774,7 +773,6 @@ else if (SetFeedbackInfo (PFeedMask, 0)) { - XPtrFeedbackState *P2; XPtrFeedbackControl ptrf; mask = DvAccelNum | DvAccelDenom | DvThreshold; ptrf.class = PtrFeedbackClass; @@ -797,7 +795,6 @@ else if (SetFeedbackInfo (BFeedMask, 0)) { XBellFeedbackControl belf; - XBellFeedbackState *B2; belf.class = BellFeedbackClass; belf.length = sizeof (XBellFeedbackControl); belf.id = 255; @@ -840,7 +837,6 @@ else if (SetFeedbackInfo (LFeedMask, 0)) { XLedFeedbackControl ledf; - XLedFeedbackState *L2; ledf.class = LedFeedbackClass; ledf.length = sizeof (XLedFeedbackControl); ledf.id = 255; diff --git a/xts5/XI/ChangeKeyboardDevice.m b/xts5/XI/ChangeKeyboardDevice.m index eeca2fb3..678db9e2 100644 --- a/xts5/XI/ChangeKeyboardDevice.m +++ b/xts5/XI/ChangeKeyboardDevice.m @@ -761,8 +761,6 @@ device has no keys. Attempt to change the keyboard to a device that has no keys. Verify BadMatch >>CODE BadMatch -Display *client2; -Window grab_window; if (!Setup_Extension_DeviceInfo(NKeysMask)) { diff --git a/xts5/XI/CloseDevice.m b/xts5/XI/CloseDevice.m index f6a66434..c7ea657c 100644 --- a/xts5/XI/CloseDevice.m +++ b/xts5/XI/CloseDevice.m @@ -131,7 +131,7 @@ Try to grab the device from another client. >>CODE int ret; Window w; -int devicekeypress, saveid; +int devicekeypress; XEventClass devicekeypressclass; Display *client1; XDevice *dev2; @@ -248,7 +248,6 @@ to CloseDevice thaws the device and releases the queued events. >>CODE int ret, count=0; Window w, w2; -int saveid; XEventClass dkpclass, dkrclass; int dkp, dkr; Display *client1; diff --git a/xts5/XI/GetDeviceMotionEvents.m b/xts5/XI/GetDeviceMotionEvents.m index d789a994..b9632962 100644 --- a/xts5/XI/GetDeviceMotionEvents.m +++ b/xts5/XI/GetDeviceMotionEvents.m @@ -297,7 +297,7 @@ Generate some motion events, verify only one is sent. Now call xname. Generate some motion events, verify another one is sent. >>CODE -int dmn, dmnh; +int dmn; XEventClass classes[2]; Window w; int axes=0, n, ret, i; @@ -318,7 +318,7 @@ XDeviceMotionEvent *d; /* Set start to a past time. */ start = gettime(display); DeviceMotionNotify(device, dmn, classes[0]); - DevicePointerMotionHint(device, dmnh, classes[1]); + DevicePointerMotionHint(device, unused, classes[1]); w = defwin(display); XSelectExtensionEvent(display, w, classes, 2); warppointer (display, w, 1, 1); diff --git a/xts5/XI/GrabDevice.m b/xts5/XI/GrabDevice.m index 7bdd2af6..bac7d0c7 100644 --- a/xts5/XI/GrabDevice.m +++ b/xts5/XI/GrabDevice.m @@ -263,7 +263,6 @@ int ret; XID badclass; int dkp; XEventClass dkpclass; -XEvent ev; if (!Setup_Extension_DeviceInfo(KeyMask | NKeysMask)) { diff --git a/xts5/XI/GrabDeviceButton.m b/xts5/XI/GrabDeviceButton.m index 2c37fd73..6fcc0534 100644 --- a/xts5/XI/GrabDeviceButton.m +++ b/xts5/XI/GrabDeviceButton.m @@ -826,7 +826,7 @@ Press the equivalent modifiers on the core keyboard Press the specified button. Verify that the grab is not activated. >>CODE -int i, ret, coremask, devmask; +int ret, coremask, devmask; Display *client1; if (!Setup_Extension_DeviceInfo(BtnMask | ModMask)) @@ -1056,7 +1056,6 @@ a BadMatch error will result. >>STRATEGY Specify a device with no keys as the modifier device. >>CODE BadMatch -Display *client2; if (!Setup_Extension_DeviceInfo(BtnMask | NKeysMask)) { @@ -1133,7 +1132,6 @@ a BadClass error will result. >>STRATEGY Specify an invalid event class. >>CODE badclass -Display *client2; XEventClass eclass = -1; XID badclass; diff --git a/xts5/XI/GrabDeviceKey.m b/xts5/XI/GrabDeviceKey.m index f5b4b0f0..c451e4f4 100644 --- a/xts5/XI/GrabDeviceKey.m +++ b/xts5/XI/GrabDeviceKey.m @@ -1115,7 +1115,6 @@ BadValue error results. >>STRATEGY Specify an invalid event class. >>CODE badclass -Display *client2; XEventClass eclass = -1; XID badclass; diff --git a/xts5/XI/SendExtensionEvent.m b/xts5/XI/SendExtensionEvent.m index 0474cd20..5311bebd 100644 --- a/xts5/XI/SendExtensionEvent.m +++ b/xts5/XI/SendExtensionEvent.m @@ -135,12 +135,11 @@ Verify that event was received. Verify that send_event was not set to False. Repeat for each event-type. >>CODE -int i,j; +int i; Window w; XAnyEvent *event; XEvent event_return; int return_value; -int noextensionevent; XEventClass noextensioneventclass; /* Create window. */ @@ -150,7 +149,7 @@ XEventClass noextensioneventclass; return; } device = Devs.Button; - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); w = mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); propagate = False; event_list = &noextensioneventclass; @@ -590,7 +589,7 @@ Verify that no events were received. >>CODE Display *client2; int return_value; -int dbp, noextensionevent; +int dbp; XEventClass dbpc, noextensioneventclass; if (!Setup_Extension_DeviceInfo(BtnMask)) @@ -599,7 +598,7 @@ XEventClass dbpc, noextensioneventclass; return; } device = Devs.Button; - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); DeviceButtonPress(Devs.Button, dbp, dbpc); /* Create client2. */ @@ -676,7 +675,7 @@ Verify that no events were received. XVisualInfo *vp; XEvent event_return; int return_value; -int dbp, noextensionevent; +int dbp; XEventClass dbpc, noextensioneventclass; /* Create window. */ @@ -686,7 +685,7 @@ XEventClass dbpc, noextensioneventclass; return; } device = Devs.Button; - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); DeviceButtonPress(device, dbp, dbpc); resetvinf(VI_WIN); nextvinf(&vp); @@ -766,7 +765,7 @@ Winh *parent; Winh *child; XSetWindowAttributes attrs; int return_value; -int dbp, noextensionevent; +int dbp; XEventClass dbpc, noextensioneventclass; /* Create a window hierarchy. */ @@ -777,7 +776,7 @@ XEventClass dbpc, noextensioneventclass; } device = Devs.Button; DeviceButtonPress(Devs.Button, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); grandparent = winh_adopt(display, (Winh *) NULL, 0L, (XSetWindowAttributes *) NULL, (Winhg *) NULL, WINH_NOMASK); if (grandparent == (Winh *) NULL) { delete("Could not create grandparent"); @@ -960,7 +959,7 @@ Window wtmp; /* useless XQueryPointer return values */ unsigned int width; unsigned int height; struct area a; -int noextensionevent, dbp; +int dbp; XEventClass noextensioneventclass, dbpc; /* Create client2. */ @@ -971,7 +970,7 @@ XEventClass noextensioneventclass, dbpc; } device = Devs.Button; DeviceButtonPress(device, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); client2 = opendisplay(); if (client2 == (Display *) NULL) { delete("Can't create new client."); @@ -1129,7 +1128,6 @@ Verify that no event was received. >>CODE XVisualInfo *vp; Window nfocus; -XEvent event_return; int return_value; int root_x, root_y; /* pointer location after XSendExtensionEvent */ int oroot_x, oroot_y; /* pointer location before XSendExtensionEvent */ @@ -1138,7 +1136,7 @@ Window oldroot; /* initial root window */ int itmp; /* useless XQueryPointer return values */ unsigned int uitmp; /* useless XQueryPointer return values */ Window wtmp; /* useless XQueryPointer return values */ -int noextensionevent, dbp; +int dbp; XEventClass noextensioneventclass, dbpc; /* Create window. */ @@ -1149,7 +1147,7 @@ XEventClass noextensioneventclass, dbpc; } device = Devs.Button; DeviceButtonPress(device, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); resetvinf(VI_WIN); nextvinf(&vp); nfocus = makewin(display, vp); @@ -1347,7 +1345,7 @@ Winh *child; int return_value; XEvent event_return; XAnyEvent *event; -int noextensionevent, dbp; +int dbp; XEventClass noextensioneventclass, dbpc; /* Set event_list to devicebuttonpressclass. */ @@ -1358,7 +1356,7 @@ XEventClass noextensioneventclass, dbpc; } device = Devs.Button; DeviceButtonPress(device, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); event_list = &dbpc; /* Set propagate to True. */ propagate = True; @@ -1525,7 +1523,7 @@ Winh *child; int return_value; XEvent event_return; XAnyEvent *event; -int noextensionevent, dbp; +int dbp; XEventClass noextensioneventclass, dbpc; /* Set event_list to devicebuttonpressclass.*/ @@ -1536,7 +1534,7 @@ XEventClass noextensioneventclass, dbpc; } device = Devs.Button; DeviceButtonPress(device, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); count = 1; event_list = &dbpc; /* Set propagate to True. */ @@ -1946,7 +1944,7 @@ int i; XAnyEvent *event; XEvent event_return; int return_value; -int noextensionevent, cdn, dmn, dsn; +int cdn, dmn, dsn; XEventClass noextensioneventclass, cdnc, dmnc, dsnc; /* Create window. */ @@ -1959,7 +1957,7 @@ XEventClass noextensioneventclass, cdnc, dmnc, dsnc; ChangeDeviceNotify(Devs.Button, cdn, cdnc); DeviceMappingNotify(Devs.Button, dmn, dmnc); DeviceStateNotify(Devs.Button, dsn, dsnc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); w = mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); propagate = False; count=1; @@ -2084,7 +2082,7 @@ int correctserial; XAnyEvent *event; XEvent event_return; int return_value; -int noextensionevent, dbp; +int dbp; XEventClass noextensioneventclass, dbpc; /* Create window. */ @@ -2100,7 +2098,7 @@ XEventClass noextensioneventclass, dbpc; XGetExtensionVersion(display,"XInputExtension"); device = Devs.Button; DeviceButtonPress(device, dbp, dbpc); - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); w = mkwin(display, (XVisualInfo *) NULL, (struct area *) NULL, False); propagate = False; count = 1; @@ -2175,7 +2173,6 @@ int n; int return_value; int good_event_types[XInputNumEvents]; long bad_event_types[NM_LEN+2]; -int noextensionevent; XEventClass noextensioneventclass; if (!Setup_Extension_DeviceInfo(BtnMask)) @@ -2184,7 +2181,7 @@ XEventClass noextensioneventclass; return; } device = Devs.Button; - NoExtensionEvent(device, noextensionevent, noextensioneventclass); + NoExtensionEvent(device, unused, noextensioneventclass); propagate = False; event_list = &noextensioneventclass; diff --git a/xts5/XI/SetDeviceButtonMapping.m b/xts5/XI/SetDeviceButtonMapping.m index a2030420..adc5cacd 100644 --- a/xts5/XI/SetDeviceButtonMapping.m +++ b/xts5/XI/SetDeviceButtonMapping.m @@ -227,7 +227,7 @@ Verify that a DeviceMappingNotify event is generated. >>CODE XEvent ev; XDeviceMappingEvent good; -int i,n,dbmn; +int n, dbmn; XEventClass dbmnc; if (!Devs.Button) { diff --git a/xts5/XI/SetDeviceModifierMapping.m b/xts5/XI/SetDeviceModifierMapping.m index 9be292a6..fad3d267 100644 --- a/xts5/XI/SetDeviceModifierMapping.m +++ b/xts5/XI/SetDeviceModifierMapping.m @@ -367,7 +367,6 @@ error was returned. >>CODE int i, ret; int kpm; -XModifierKeymap *newmap; if (!Devs.Mod) { untested("%s: No input extension key device.\n", TestName); diff --git a/xts5/XI/UngrabDeviceButton.m b/xts5/XI/UngrabDeviceButton.m index 16484cfe..16cb9bda 100644 --- a/xts5/XI/UngrabDeviceButton.m +++ b/xts5/XI/UngrabDeviceButton.m @@ -226,8 +226,6 @@ static Bool dgrabbed(dev, win) } >>CODE -int ret; - if (!Setup_Extension_DeviceInfo(KeyMask | BtnMask)) { untested("%s: Required input extension device not present.\n", TestName); diff --git a/xts5/XI/XChangeDeviceDontPropagateList.m b/xts5/XI/XChangeDeviceDontPropagateList.m index 275cd8ba..1d9fb43e 100644 --- a/xts5/XI/XChangeDeviceDontPropagateList.m +++ b/xts5/XI/XChangeDeviceDontPropagateList.m @@ -298,7 +298,6 @@ Call xname with an invalid window id. Verify that a BadWindow error is generated. >>CODE BadWindow int ret; -int ximajor, first, err; if (!Setup_Extension_DeviceInfo(KeyMask)) { @@ -324,7 +323,6 @@ Call xname with an invalid window id. Verify that a BadWindow error is generated. >>CODE badmode int ret, badmode; -int ximajor, first, err; if (!Setup_Extension_DeviceInfo(KeyMask)) { diff --git a/xts5/XI/XGetDeviceDontPropagateList.m b/xts5/XI/XGetDeviceDontPropagateList.m index d132d349..179e025a 100644 --- a/xts5/XI/XGetDeviceDontPropagateList.m +++ b/xts5/XI/XGetDeviceDontPropagateList.m @@ -152,7 +152,6 @@ A call to xname with an invalid window returns a BadWindow error. >>STRATEGY Call xname with an invalid window. >>CODE BadWindow -Window w; Display *client1; XEventClass *ret; diff --git a/xts5/XI/XGetDeviceKeyMapping.m b/xts5/XI/XGetDeviceKeyMapping.m index 494148ba..7b3dd9b2 100644 --- a/xts5/XI/XGetDeviceKeyMapping.m +++ b/xts5/XI/XGetDeviceKeyMapping.m @@ -131,8 +131,6 @@ static KeySym Keys[MAXKPK*MAXCODES]; static void savekeymap() { -int tmp; -int last; int i; int numkeys; diff --git a/xts5/XI/XGetDeviceModifierMapping.m b/xts5/XI/XGetDeviceModifierMapping.m index 010cc8a1..e7b42b79 100644 --- a/xts5/XI/XGetDeviceModifierMapping.m +++ b/xts5/XI/XGetDeviceModifierMapping.m @@ -194,12 +194,9 @@ int minkc, maxkc, numkeys; XModifierKeymap *map; XModifierKeymap *savemap; int k; -int j; int i; int row; int non_zero = 0; -int ndevices; -int ret; if (!Setup_Extension_DeviceInfo(KeyMask | ModMask | BtnMask)) { diff --git a/xts5/XI/XGetSelectedExtensionEvents.m b/xts5/XI/XGetSelectedExtensionEvents.m index 342a069b..30934669 100644 --- a/xts5/XI/XGetSelectedExtensionEvents.m +++ b/xts5/XI/XGetSelectedExtensionEvents.m @@ -187,7 +187,6 @@ A call to xname with an invalid window returns a BadWindow error. >>STRATEGY Call xname with an invalid window. >>CODE BadWindow -Window w; Display *client1; int ret; diff --git a/xts5/XI/XQueryDeviceState.m b/xts5/XI/XQueryDeviceState.m index 26300a42..003477e5 100644 --- a/xts5/XI/XQueryDeviceState.m +++ b/xts5/XI/XQueryDeviceState.m @@ -112,7 +112,7 @@ Generate some motion events, verify only one is sent. Now call xname. Generate some motion events, verify another one is sent. >>CODE -int dmn, dmnh; +int dmn; XEventClass classes[2]; Window w; int axes=1, n, i; @@ -129,7 +129,7 @@ XDeviceMotionEvent *d; return; device = Devs.Valuator; DeviceMotionNotify(device, dmn, classes[0]); - DevicePointerMotionHint(device, dmnh, classes[1]); + DevicePointerMotionHint(device, unused, classes[1]); w = defwin(display); XSelectExtensionEvent(display, w, classes, 2); warppointer (display, w, 1, 1); diff --git a/xts5/XI/XSelectExtensionEvent.m b/xts5/XI/XSelectExtensionEvent.m index f22063b2..1b361e1c 100644 --- a/xts5/XI/XSelectExtensionEvent.m +++ b/xts5/XI/XSelectExtensionEvent.m @@ -408,7 +408,7 @@ Verify selected events have not changed. Display *client2; int tcount, acount; XEventClass *this_client, *all_clients, dkpclass, nevclass, classes[5]; -int dkp, nev, tmp; +int dkp, tmp; if (!Setup_Extension_DeviceInfo(KeyMask)) { @@ -416,7 +416,7 @@ int dkp, nev, tmp; return; } DeviceKeyPress(Devs.Key, dkp, dkpclass); - NoExtensionEvent(Devs.Key, nev, nevclass); + NoExtensionEvent(Devs.Key, unused, nevclass); classes[0] = dkpclass; DeviceKeyRelease(Devs.Key, tmp, classes[1]); DeviceStateNotify(Devs.Key, tmp, classes[2]); @@ -724,7 +724,7 @@ DeviceButtonPress event class, automatic passive grabs are done for the requesting client. >>STRATEGY >>CODE -int dbp, dmn, dbr, dbpg; +int dbp, dmn, dbr; XEventClass class[4]; Window w; int axes[2]; @@ -740,7 +740,7 @@ XEvent event; DeviceButtonPress(Devs.Button, dbp, class[0]); DeviceMotionNotify(Devs.Button, dmn, class[1]); DeviceButtonRelease(Devs.Button, dbr, class[2]); - DeviceButtonPressGrab(Devs.Button, dbpg, class[3]); + DeviceButtonPressGrab(Devs.Button, unused, class[3]); w = defwin(display); XSelectExtensionEvent(display, w, class, 4); warppointer(display, w, 1, 1); @@ -808,7 +808,7 @@ DeviceButtonPress event class, automatic passive grabs activate with owner_events equal to False. >>STRATEGY >>CODE -int dbp, dmn, dbr, dbpg; +int dbp, dmn, dbr; XEventClass class[4]; Window w; int axes[2]; @@ -824,7 +824,7 @@ XEvent event; DeviceButtonPress(Devs.Button, dbp, class[0]); DeviceMotionNotify(Devs.Button, dmn, class[1]); DeviceButtonRelease(Devs.Button, dbr, class[2]); - DeviceButtonPressGrab(Devs.Button, dbpg, class[3]); + DeviceButtonPressGrab(Devs.Button, unused, class[3]); w = defwin(display); XSelectExtensionEvent(display, w, class, 4); XSync(display,0); @@ -898,7 +898,7 @@ grabs activate with owner_events equal to True. requesting client. >>STRATEGY >>CODE -int dbp, dmn, dbr, dbpg, dbpog; +int dbp, dmn, dbr; XEventClass class[5]; Window w; int axes[2]; @@ -914,8 +914,8 @@ XEvent event; DeviceButtonPress(Devs.Button, dbp, class[0]); DeviceMotionNotify(Devs.Button, dmn, class[1]); DeviceButtonRelease(Devs.Button, dbr, class[2]); - DeviceButtonPressGrab(Devs.Button, dbpg, class[3]); - DeviceOwnerGrabButton(Devs.Button, dbpog, class[4]); + DeviceButtonPressGrab(Devs.Button, unused, class[3]); + DeviceOwnerGrabButton(Devs.Button, unused, class[4]); w = defwin(display); XSelectExtensionEvent(display, w, class, 5); @@ -1009,8 +1009,8 @@ when the specified button is down. >>STRATEGY >>CODE XEventClass dbmclasses[6]; -int dbm1, dbm2, dbm3, dbm4, dbm5; -int i, axes[2]; +int dbm1; +int axes[2]; XEvent event; @@ -1023,11 +1023,11 @@ XEvent event; } DeviceMotionNotify(Devs.Button, dbm1, dbmclasses[0]); DeviceButton1Motion(Devs.Button, dbm1, dbmclasses[0]); - DeviceButton2Motion(Devs.Button, dbm2, dbmclasses[1]); - DeviceButton3Motion(Devs.Button, dbm3, dbmclasses[2]); - DeviceButton4Motion(Devs.Button, dbm4, dbmclasses[3]); - DeviceButton5Motion(Devs.Button, dbm5, dbmclasses[4]); - DeviceButtonMotion(Devs.Button, dbm5, dbmclasses[5]); + DeviceButton2Motion(Devs.Button, unused, dbmclasses[1]); + DeviceButton3Motion(Devs.Button, unused, dbmclasses[2]); + DeviceButton4Motion(Devs.Button, unused, dbmclasses[3]); + DeviceButton5Motion(Devs.Button, unused, dbmclasses[4]); + DeviceButtonMotion(Devs.Button, unused, dbmclasses[5]); w = defwin(display); XSetDeviceFocus(display, Devs.Button, w, RevertToPointerRoot, CurrentTime); @@ -1230,7 +1230,7 @@ until a button is pressed on that device. >>STRATEGY >>CODE XEventClass classes[3]; -int dmn, dmh; +int dmn; int i, axes[2]; XEvent event; @@ -1242,7 +1242,7 @@ XEvent event; return; } DeviceMotionNotify(Devs.Button, dmn, classes[0]); - DevicePointerMotionHint(Devs.Button,dmh,classes[1]); + DevicePointerMotionHint(Devs.Button, unused, classes[1]); w = defwin(display); XSetDeviceFocus(display, Devs.Button, w, RevertToPointerRoot, CurrentTime); @@ -1332,7 +1332,6 @@ window for which another client has already specified DeviceButtonPressGrab. >>CODE Display *client1; Display *client2; -int dbpgtype; XEventClass dbpgclass; if (!Setup_Extension_DeviceInfo(BtnMask)) @@ -1351,7 +1350,7 @@ XEventClass dbpgclass; /* Create window with client1. */ w = mkwin(client1, (XVisualInfo *) NULL, (struct area *) NULL, False); /* Select DeviceButtonPressGrab class with client1 on this window. */ - DeviceButtonPressGrab(Devs.Button, dbpgtype, dbpgclass); + DeviceButtonPressGrab(Devs.Button, unused, dbpgclass); BASIC_STARTCALL(client1); eclass = &dbpgclass; ecount = 1; diff --git a/xts5/XI/XSetDeviceFocus.m b/xts5/XI/XSetDeviceFocus.m index 60e3981e..5ecd6550 100644 --- a/xts5/XI/XSetDeviceFocus.m +++ b/xts5/XI/XSetDeviceFocus.m @@ -218,7 +218,6 @@ static char *WindowTree[]= { static int NWindowTree = NELEM(WindowTree); >>CODE -int keycode; XEvent ev; int dkp, dkr; XEventClass classes[2]; @@ -322,9 +321,8 @@ else report untested. >>CODE Window win, root, altroot; -int keycode; XEvent ev; -int dkp, dkr, nev; +int dkp, dkr; XEventClass classes[2], nevclass; if (noext(0)) @@ -340,7 +338,7 @@ XEventClass classes[2], nevclass; device = Devs.Key; DeviceKeyPress(device, dkp, classes[0]); DeviceKeyRelease(device, dkr, classes[1]); - NoExtensionEvent(device, nev, nevclass); + NoExtensionEvent(device, unused, nevclass); win = defwin(display); XSelectExtensionEvent(display, win, classes, 2); @@ -601,7 +599,7 @@ XEvent ev; Window newfocus; int newrevert; Time newtime; -int dfi, dfo, nev; +int dfi, dfo; XEventClass classes[2], nevclass; if (!Setup_Extension_DeviceInfo(FocusMask)) @@ -612,7 +610,7 @@ XEventClass classes[2], nevclass; device = Devs.Focus; DeviceFocusIn(device, dfi, classes[0]); DeviceFocusOut(device, dfo, classes[1]); - NoExtensionEvent(device, nev, nevclass); + NoExtensionEvent(device, unused, nevclass); /* * Use a non-default display, because we are setting the event mask diff --git a/xts5/XIproto/GetDeviceDontPropagateList.m b/xts5/XIproto/GetDeviceDontPropagateList.m index 1bdafbb8..ca0ff5ca 100644 --- a/xts5/XIproto/GetDeviceDontPropagateList.m +++ b/xts5/XIproto/GetDeviceDontPropagateList.m @@ -130,7 +130,6 @@ tester() { Window w; Display *client1, *opendisplay(); -int ret; Create_Client(CLIENT); diff --git a/xts5/Xlib10/XAddToSaveSet.m b/xts5/Xlib10/XAddToSaveSet.m index 949a9fe5..24435a21 100644 --- a/xts5/Xlib10/XAddToSaveSet.m +++ b/xts5/Xlib10/XAddToSaveSet.m @@ -163,7 +163,7 @@ struct buildtree *bt1; struct buildtree *btp; XWindowAttributes batts; int i, j; -int pass = 0, fail = 0; +int fail = 0; client1 = XOpenDisplay(config.display); client2 = opendisplay(); diff --git a/xts5/Xlib10/XRemoveHosts.m b/xts5/Xlib10/XRemoveHosts.m index 347b5acc..bc52252b 100644 --- a/xts5/Xlib10/XRemoveHosts.m +++ b/xts5/Xlib10/XRemoveHosts.m @@ -119,7 +119,6 @@ If call fails with a BadAccess: Get new acl. Verify that host is not in new acl. >>CODE -XHostAddress *oldhosts; XHostAddress *newhosts; int nhosts; Bool state; diff --git a/xts5/Xlib11/CirculateRequest.m b/xts5/Xlib11/CirculateRequest.m index 8c9e8b7f..2b79bd1a 100644 --- a/xts5/Xlib11/CirculateRequest.m +++ b/xts5/Xlib11/CirculateRequest.m @@ -131,7 +131,7 @@ Verify that no events were delivered to client3. >>CODE Display *display = Dsp; Display *client2, *client3; -Winh *parent, *lastw, *winh; +Winh *parent, *lastw; Winhg winhg; XEvent event; int i; diff --git a/xts5/Xlib11/ConfigureRequest.m b/xts5/Xlib11/ConfigureRequest.m index 952f5132..9775f465 100644 --- a/xts5/Xlib11/ConfigureRequest.m +++ b/xts5/Xlib11/ConfigureRequest.m @@ -670,7 +670,6 @@ int i; int status; int numchildren = 4; int count; -XWindowChanges values; XSetWindowAttributes attrs; unsigned long valuemask; diff --git a/xts5/Xlib11/Expose.m b/xts5/Xlib11/Expose.m index 46549870..c4b27d94 100644 --- a/xts5/Xlib11/Expose.m +++ b/xts5/Xlib11/Expose.m @@ -191,7 +191,6 @@ Verify that Expose events are contiguously delivered. >>CODE Display *display; Winh *eventw; -Winh *child; Winhe *winhe; int expected; int lastcount; @@ -309,7 +308,6 @@ Verify that no Expose events are received for client3. Display *display = Dsp; Display *client2, *client3; Winh *eventw; -int events; Window w; XEvent event_return; diff --git a/xts5/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/Test1.c index 261e8604..d7f548bc 100644 --- a/xts5/Xlib12/XDisplayName/Test1.c +++ b/xts5/Xlib12/XDisplayName/Test1.c @@ -138,10 +138,8 @@ int argc; char *argv[]; { int pass = 0, fail = 0; -char *res_name; char *dispstr; char *rdispstr; -Display *display; char *str; exec_startup(); diff --git a/xts5/Xlib12/XDisplayName/XDisplayName.m b/xts5/Xlib12/XDisplayName/XDisplayName.m index 81d7dfc2..74a4482e 100644 --- a/xts5/Xlib12/XDisplayName/XDisplayName.m +++ b/xts5/Xlib12/XDisplayName/XDisplayName.m @@ -160,7 +160,6 @@ char *argv[2]; char *str; char *dstr; char *mstr = "DISPLAY=%s"; -int pass = 0, fail = 0; if((dstr = getenv("DISPLAY")) == (char *) NULL) { delete("DISPLAY configuration variable is not defined."); diff --git a/xts5/Xlib12/XSendEvent.m b/xts5/Xlib12/XSendEvent.m index aa086de8..8e527edc 100644 --- a/xts5/Xlib12/XSendEvent.m +++ b/xts5/Xlib12/XSendEvent.m @@ -1100,7 +1100,6 @@ Verify that no event was received. >>CODE XVisualInfo *vp; Window nfocus; -XEvent event_return; int return_value; int root_x, root_y; /* pointer location after XSendEvent */ int oroot_x, oroot_y; /* pointer location before XSendEvent */ diff --git a/xts5/Xlib12/XSetErrorHandler.m b/xts5/Xlib12/XSetErrorHandler.m index ddc351b7..dfb7a992 100644 --- a/xts5/Xlib12/XSetErrorHandler.m +++ b/xts5/Xlib12/XSetErrorHandler.m @@ -550,7 +550,6 @@ int (*proc)(); Display *display = Dsp; int oldcounter; Window w; -unsigned long nextrequest; /* Call XSetErrorHandler to set error handler to errorhandler. */ handler = errorhandler; diff --git a/xts5/Xlib12/XWindowEvent.m b/xts5/Xlib12/XWindowEvent.m index 90a984c0..83568c17 100644 --- a/xts5/Xlib12/XWindowEvent.m +++ b/xts5/Xlib12/XWindowEvent.m @@ -242,7 +242,6 @@ Verify the event contained correct window. >>CODE XEvent event; XAnyEvent *ep; -int callcnt; Block_Info info; int block_status; Pixmap pm; diff --git a/xts5/Xlib13/XGrabButton.m b/xts5/Xlib13/XGrabButton.m index 5899adb0..8bf89eb9 100644 --- a/xts5/Xlib13/XGrabButton.m +++ b/xts5/Xlib13/XGrabButton.m @@ -852,7 +852,6 @@ else Report untested. >>CODE extern struct valname S_button[]; -extern int NS_button; int i; button = AnyButton; diff --git a/xts5/Xlib13/XInsertModifiermapEntry.m b/xts5/Xlib13/XInsertModifiermapEntry.m index a0ffe1ec..834a5b79 100644 --- a/xts5/Xlib13/XInsertModifiermapEntry.m +++ b/xts5/Xlib13/XInsertModifiermapEntry.m @@ -135,7 +135,6 @@ static struct kcmod kcmod[] = { }; int i; int set; -extern int NS_modifier; modmap = XNewModifiermap(0); if (modmap == 0) { diff --git a/xts5/Xlib14/XBaseFontNameListOfFontSet.m b/xts5/Xlib14/XBaseFontNameListOfFontSet.m index 8d30c7f4..a7b5637a 100644 --- a/xts5/Xlib14/XBaseFontNameListOfFontSet.m +++ b/xts5/Xlib14/XBaseFontNameListOfFontSet.m @@ -129,7 +129,6 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; diff --git a/xts5/Xlib14/XCloseIM.m b/xts5/Xlib14/XCloseIM.m index 49e27f24..7f9f37cb 100644 --- a/xts5/Xlib14/XCloseIM.m +++ b/xts5/Xlib14/XCloseIM.m @@ -124,7 +124,7 @@ status. #if XT_X_RELEASE > 4 int ncheck; char *plocale; -Bool res,status; +Bool status; #endif #if XT_X_RELEASE > 4 diff --git a/xts5/Xlib14/XContextDependentDrawing.m b/xts5/Xlib14/XContextDependentDrawing.m index 3aa1dc57..38101eee 100644 --- a/xts5/Xlib14/XContextDependentDrawing.m +++ b/xts5/Xlib14/XContextDependentDrawing.m @@ -129,11 +129,9 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; -char *base_font_name; Bool res; #endif diff --git a/xts5/Xlib14/XExtentsOfFontSet.m b/xts5/Xlib14/XExtentsOfFontSet.m index 35742bf0..0c746807 100644 --- a/xts5/Xlib14/XExtentsOfFontSet.m +++ b/xts5/Xlib14/XExtentsOfFontSet.m @@ -128,7 +128,6 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; diff --git a/xts5/Xlib14/XFontsOfFontSet.m b/xts5/Xlib14/XFontsOfFontSet.m index 7db882dd..3e68f02d 100644 --- a/xts5/Xlib14/XFontsOfFontSet.m +++ b/xts5/Xlib14/XFontsOfFontSet.m @@ -131,7 +131,6 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; diff --git a/xts5/Xlib14/XFreeFontSet.m b/xts5/Xlib14/XFreeFontSet.m index 4d34c84d..b8e5d9fe 100644 --- a/xts5/Xlib14/XFreeFontSet.m +++ b/xts5/Xlib14/XFreeFontSet.m @@ -126,7 +126,6 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; diff --git a/xts5/Xlib14/XGetICValues.m b/xts5/Xlib14/XGetICValues.m index eff34342..c2c88740 100644 --- a/xts5/Xlib14/XGetICValues.m +++ b/xts5/Xlib14/XGetICValues.m @@ -713,7 +713,7 @@ For all locales, create an input method and for all supported styles create an input context, then fetch the status ic values. >>CODE #if XT_X_RELEASE > 4 -ic_val_def icv,*picv; +ic_val_def *picv; Display *dpy; char *plocale; XrmDatabase db = NULL; diff --git a/xts5/Xlib14/XLocaleOfFontSet.m b/xts5/Xlib14/XLocaleOfFontSet.m index fb71ab6f..7a503d04 100644 --- a/xts5/Xlib14/XLocaleOfFontSet.m +++ b/xts5/Xlib14/XLocaleOfFontSet.m @@ -128,11 +128,9 @@ Display *dpy; char *plocale; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; -char *base_font_name; char *locale_name; #endif diff --git a/xts5/Xlib14/XSetICFocus.m b/xts5/Xlib14/XSetICFocus.m index fec4f3be..d01403f5 100644 --- a/xts5/Xlib14/XSetICFocus.m +++ b/xts5/Xlib14/XSetICFocus.m @@ -91,12 +91,10 @@ extern int errflg; extern int chkflg; extern int signal_status(); extern int unexp_err(); -extern char *svc_user_arg; extern char *strcpy(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; -int skip_pixcheck; XIM im_value ; XIMStyle which_style; Window ret_window ; @@ -104,15 +102,8 @@ Window ret_window ; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, i1; -char *locale ; -char **list_return ; -int count_return ; -char *def_string_return ; -char *svc_ret_value ; - regr_args.l_flags.bufrout = 1; (void)strcpy(fmtstr, "*********************\n"); diff --git a/xts5/Xlib14/XSetICValues.m b/xts5/Xlib14/XSetICValues.m index dcb3edc0..ed5a74e3 100644 --- a/xts5/Xlib14/XSetICValues.m +++ b/xts5/Xlib14/XSetICValues.m @@ -616,9 +616,8 @@ int ncheck = 0; char *pstr; ic_val_def icv,*picv,*ret_icv; ic_list_def *ils; -int type,dummy; +int dummy; att_def *att,ret_att; -char name_sub[128]; char name[128]; #endif @@ -843,9 +842,8 @@ ic_val_def icv,*picv,*ret_icv; int nstyles = 0; int ncheck = 0; ic_list_def *ils; -int type,dummy; +int dummy; att_def *att,ret_att; -char name_sub[128]; char name[128]; #endif @@ -1053,7 +1051,6 @@ XIM im = NULL; XFontSet fs = NULL; XrmDatabase db = NULL; int ncheck = 0; -char *pstr; int cur_cnt; XEvent ev; #endif diff --git a/xts5/Xlib14/XSetLocaleModifiers.m b/xts5/Xlib14/XSetLocaleModifiers.m index 796c9a36..09596610 100644 --- a/xts5/Xlib14/XSetLocaleModifiers.m +++ b/xts5/Xlib14/XSetLocaleModifiers.m @@ -74,7 +74,6 @@ XSetLocaleModifiers for every locale modifier set specified by the user in the configuration file. >>CODE #if XT_X_RELEASE > 4 -Display *dpy; char *plocale,*plclmod; char *modstr; Bool supported; diff --git a/xts5/Xlib14/XSupportsLocale.m b/xts5/Xlib14/XSupportsLocale.m index b165539c..5f61f21b 100644 --- a/xts5/Xlib14/XSupportsLocale.m +++ b/xts5/Xlib14/XSupportsLocale.m @@ -121,9 +121,7 @@ For every Locale specified by the user in the configuration file, set LC_CTYPE to that locale, call XSupportsLocale to see if is supported. >>CODE #if XT_X_RELEASE > 4 -Display *dpy; char *plocale; -char str[128]; Bool res; char *p; #endif diff --git a/xts5/Xlib14/XUnsetICFocus.m b/xts5/Xlib14/XUnsetICFocus.m index 6f963499..c005acbd 100644 --- a/xts5/Xlib14/XUnsetICFocus.m +++ b/xts5/Xlib14/XUnsetICFocus.m @@ -92,12 +92,6 @@ int x_init, *****/ mod_stat() { - extern Display *dpy_save; - extern Window wid_save; - extern Pixmap pid_save; - extern GC gc_save; - extern XWindowAttributes wat_save; - /* * insert modifications to saved data here */ @@ -117,7 +111,6 @@ int x_init, extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -125,7 +118,6 @@ int x_init, ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; XIM im_value ; Window ret_window ; @@ -133,16 +125,8 @@ int x_init, ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, i1; - char *locale ; - char **list_return ; - int count_return ; - char *def_string_return ; - char *svc_ret_value ; - - /****** * Turn on buffering and buffer parameter information * in case an error occurs diff --git a/xts5/Xlib14/XVaCreateNestedList.m b/xts5/Xlib14/XVaCreateNestedList.m index c2977cf7..62e3d83a 100644 --- a/xts5/Xlib14/XVaCreateNestedList.m +++ b/xts5/Xlib14/XVaCreateNestedList.m @@ -455,14 +455,8 @@ For all locales, build a variable list of one element, verify that a nested list is returned. >>CODE #if XT_X_RELEASE > 4 -char cmd[32]; -int a1,cnt,tmp; char *plocale; -XVaNestedList va; -char *p; -int *pi; /* SetICValues stuff */ -char *ic_name1, *ic_name2, *ic_name3; XIC ic; char *ic_name; ic_val_def *ic_val; @@ -476,9 +470,8 @@ ic_val_def icv,*picv,*ret_icv; int nstyles = 0; int ncheck = 0; ic_list_def *ils; -int type,dummy; +int dummy; att_def *att,ret_att; -char name_sub[128]; char name[128]; #endif @@ -661,19 +654,13 @@ For all locales, build a variable list of two elements, verify that a nested list is returned. >>CODE #if XT_X_RELEASE > 4 -char cmd[2][32]; -int a[2],cnt; char *plocale; -XVaNestedList va; -char *p; -int *pi; -int j,tmp; /* SetICValues stuff */ XIC ic; char *ic_name; ic_val_def *ic_val; char *ic_name1, *ic_name2; -ic_val_def icv1, icv2, *picv, *ret_icv1, *ret_icv2; +ic_val_def *picv; char *endlist = NULL; Display *dpy; XIM im = NULL; @@ -684,13 +671,11 @@ ic_val_def icv,*ret_icv; int nstyles = 0; int ncheck = 0; ic_list_def *ils; -int type, dummy; +int dummy; att_def *att, ret_att; -char name_sub[128]; char name[128]; XPointer val1, val2; int index1, index2; -ic_val_def ic_val1, ic_val2, ic_val3; #endif #if XT_X_RELEASE > 4 @@ -898,20 +883,13 @@ argument as a parameter to a second nested list, verify that a nested list is returned. >>CODE #if XT_X_RELEASE > 4 -int a1,cnt; char *plocale; -XVaNestedList va,va2; -char cmd[32]; -char va_cmd[32]; -char *p; -int *pi; -int tmp; /* SetICValues stuff */ XIC ic; char *ic_name; ic_val_def *ic_val; char *ic_name1, *ic_name2; -ic_val_def icv1, icv2, *picv, *ret_icv1, *ret_icv2; +ic_val_def *picv; char *endlist = NULL; Display *dpy; XIM im = NULL; @@ -922,13 +900,11 @@ ic_val_def icv,*ret_icv; int nstyles = 0; int ncheck = 0; ic_list_def *ils; -int type, dummy; -att_def *att, *att1, ret_att; -char name_sub[128]; +int dummy; +att_def *att, ret_att; char name[128]; XPointer val1, val2; int index1, index2; -ic_val_def ic_val1, ic_val2, ic_val3; XVaNestedList va_temp; #endif diff --git a/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m b/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m index a60780df..45bb0661 100644 --- a/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m +++ b/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m @@ -151,7 +151,6 @@ XVisualInfo *vp; unsigned int width, height; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; int skipped; diff --git a/xts5/Xlib14/XmbDrawString/XmbDrawString.m b/xts5/Xlib14/XmbDrawString/XmbDrawString.m index 60fcdc66..dcfc12a1 100644 --- a/xts5/Xlib14/XmbDrawString/XmbDrawString.m +++ b/xts5/Xlib14/XmbDrawString/XmbDrawString.m @@ -159,7 +159,6 @@ XVisualInfo *vp; unsigned int width, height; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; int skipped; diff --git a/xts5/Xlib14/XmbDrawText/XmbDrawText.m b/xts5/Xlib14/XmbDrawText/XmbDrawText.m index 7a19ffdd..26c2f824 100644 --- a/xts5/Xlib14/XmbDrawText/XmbDrawText.m +++ b/xts5/Xlib14/XmbDrawText/XmbDrawText.m @@ -170,7 +170,6 @@ XVisualInfo *vp; unsigned int width, height; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; diff --git a/xts5/Xlib14/XmbResetIC.m b/xts5/Xlib14/XmbResetIC.m index 1ace0e7b..e0365e02 100644 --- a/xts5/Xlib14/XmbResetIC.m +++ b/xts5/Xlib14/XmbResetIC.m @@ -120,7 +120,6 @@ setup_locale() extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -128,17 +127,13 @@ setup_locale() ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, i1; - char *svc_ret_value ; - /****** * Turn on buffering and buffer parameter information diff --git a/xts5/Xlib14/XmbSetWMProperties.m b/xts5/Xlib14/XmbSetWMProperties.m index 4c41e52a..facfaead 100644 --- a/xts5/Xlib14/XmbSetWMProperties.m +++ b/xts5/Xlib14/XmbSetWMProperties.m @@ -156,19 +156,12 @@ XClassHint *classh_good ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int ss_status, /* save stat return status */ - stat_status, /* check stat return status */ setup_status, - cleanup_status, - i1; + stat_status; /* check stat return status */ /* @@ -195,7 +188,6 @@ static Atom actual_type; static int actual_format, idx, i; static unsigned long nitems, fitems; static unsigned long leftover; -XEvent good_event, event_return_good; /****** * Turn on buffering and buffer parameter information diff --git a/xts5/Xlib14/XmbTextEscapement.m b/xts5/Xlib14/XmbTextEscapement.m index a2deca10..05c134a4 100644 --- a/xts5/Xlib14/XmbTextEscapement.m +++ b/xts5/Xlib14/XmbTextEscapement.m @@ -135,7 +135,6 @@ pixels to the origin of the next character in the primary draw direction. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; diff --git a/xts5/Xlib14/XmbTextExtents.m b/xts5/Xlib14/XmbTextExtents.m index 50161a59..f76828e6 100644 --- a/xts5/Xlib14/XmbTextExtents.m +++ b/xts5/Xlib14/XmbTextExtents.m @@ -140,7 +140,6 @@ logical extents. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; diff --git a/xts5/Xlib14/XmbTextListToTextProperty.m b/xts5/Xlib14/XmbTextListToTextProperty.m index 6bde9714..659a9e18 100644 --- a/xts5/Xlib14/XmbTextListToTextProperty.m +++ b/xts5/Xlib14/XmbTextListToTextProperty.m @@ -75,22 +75,18 @@ int count_good ; XICCEncodingStyle style_good ; XTextProperty text_prop_good ; { - extern int errcnt; extern int errflg; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; Status ret_status ; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, cleanup_status, i1; + setup_status, + cleanup_status; regr_args.l_flags.bufrout = 1; diff --git a/xts5/Xlib14/XmbTextPerCharExtents.m b/xts5/Xlib14/XmbTextPerCharExtents.m index 66a35261..d927e954 100644 --- a/xts5/Xlib14/XmbTextPerCharExtents.m +++ b/xts5/Xlib14/XmbTextPerCharExtents.m @@ -146,7 +146,6 @@ extents of the characters. Make sure the returned status is good. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; diff --git a/xts5/Xlib14/XmbTextPropertyToTextList.m b/xts5/Xlib14/XmbTextPropertyToTextList.m index 5e38df31..577a4427 100644 --- a/xts5/Xlib14/XmbTextPropertyToTextList.m +++ b/xts5/Xlib14/XmbTextPropertyToTextList.m @@ -87,12 +87,6 @@ int x_init, *****/ mod_stat() { - extern Display *dpy_save; - extern Window wid_save; - extern Pixmap pid_save; - extern GC gc_save; - extern XWindowAttributes wat_save; - /* * insert modifications to saved data here */ @@ -117,7 +111,6 @@ int x_init, extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -125,7 +118,6 @@ int x_init, ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; Status ret_status ; char *s ; diff --git a/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m b/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m index 124b245c..7b471294 100644 --- a/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m +++ b/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m @@ -153,7 +153,6 @@ char *plocale; XVisualInfo *vp; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; int skipped; diff --git a/xts5/Xlib14/XwcDrawString/XwcDrawString.m b/xts5/Xlib14/XwcDrawString/XwcDrawString.m index 155e80dc..616a1b64 100644 --- a/xts5/Xlib14/XwcDrawString/XwcDrawString.m +++ b/xts5/Xlib14/XwcDrawString/XwcDrawString.m @@ -165,7 +165,6 @@ XVisualInfo *vp; unsigned int width, height; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; int skipped; diff --git a/xts5/Xlib14/XwcDrawText/XwcDrawText.m b/xts5/Xlib14/XwcDrawText/XwcDrawText.m index fc6dcd48..154a775d 100644 --- a/xts5/Xlib14/XwcDrawText/XwcDrawText.m +++ b/xts5/Xlib14/XwcDrawText/XwcDrawText.m @@ -169,14 +169,12 @@ XVisualInfo *vp; unsigned int width, height; char *font_list; XFontSet pfs; -char *fontset; char *defstr; int missing_cnt; char **missing_chars; char buf[256]; int delta; int skipped; -char *charstr; wchar_t wcharstr[T1_NITEMS][T1_GROUPSIZE]; XwcTextItem ti[T1_NITEMS]; #endif diff --git a/xts5/Xlib14/XwcFreeStringList.m b/xts5/Xlib14/XwcFreeStringList.m index df76fec2..408de432 100644 --- a/xts5/Xlib14/XwcFreeStringList.m +++ b/xts5/Xlib14/XwcFreeStringList.m @@ -89,12 +89,10 @@ extern int errflg; extern int chkflg; extern int signal_status(); extern int unexp_err(); -extern char *svc_user_arg; extern char *strcpy(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; -int skip_pixcheck; int @@ -203,7 +201,6 @@ shall free the string list and component strings allocated by XwcTextPropertyToTextList. >>CODE #if XT_X_RELEASE > 4 -int i,j; XTextProperty prop_return; wchar_t **list_return; int count_return; diff --git a/xts5/Xlib14/XwcResetIC.m b/xts5/Xlib14/XwcResetIC.m index d0d70199..867d6347 100644 --- a/xts5/Xlib14/XwcResetIC.m +++ b/xts5/Xlib14/XwcResetIC.m @@ -115,23 +115,17 @@ XIC ic ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, i1; - char *svc_ret_value ; - - regr_args.l_flags.bufrout = 1; (void)strcpy(fmtstr, "*********************\n"); diff --git a/xts5/Xlib14/XwcTextEscapement.m b/xts5/Xlib14/XwcTextEscapement.m index f5de08f9..b1534c75 100644 --- a/xts5/Xlib14/XwcTextEscapement.m +++ b/xts5/Xlib14/XwcTextEscapement.m @@ -134,14 +134,13 @@ pixels to the origin of the next character in the primary draw direction. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; int missing_cnt; char **missing_chars; XFontSetExtents *ext; -int escapement,nbytes,maxescape; +int escapement, maxescape; wchar_t wcharstr[512]; #endif diff --git a/xts5/Xlib14/XwcTextExtents.m b/xts5/Xlib14/XwcTextExtents.m index 37d4bd2a..dfc02445 100644 --- a/xts5/Xlib14/XwcTextExtents.m +++ b/xts5/Xlib14/XwcTextExtents.m @@ -140,14 +140,13 @@ logical extents. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; int missing_cnt; char **missing_chars; XFontSetExtents *ext; -int escapement,nbytes,maxescape; +int escapement, maxescape; XRectangle ink,logical; wchar_t wcharstr[512]; #endif diff --git a/xts5/Xlib14/XwcTextListToTextProperty.m b/xts5/Xlib14/XwcTextListToTextProperty.m index c18d25bb..0e5d3a62 100644 --- a/xts5/Xlib14/XwcTextListToTextProperty.m +++ b/xts5/Xlib14/XwcTextListToTextProperty.m @@ -91,12 +91,6 @@ int x_init, *****/ mod_stat() { - extern Display *dpy_save; - extern Window wid_save; - extern Pixmap pid_save; - extern GC gc_save; - extern XWindowAttributes wat_save; - /* * insert modifications to saved data here */ @@ -118,20 +112,15 @@ XTextProperty text_prop_good; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; Status ret_status ; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, - i1; + cleanup_status; regr_args.l_flags.bufrout = 1; @@ -265,7 +254,6 @@ int ret; { int i ; XTextProperty text_prop ; - int count = 1; memset(string_good, 0, sizeof(string_good)); for (i = 0 ; i < 10 ; i++) diff --git a/xts5/Xlib14/XwcTextPerCharExtents.m b/xts5/Xlib14/XwcTextPerCharExtents.m index a3819b21..fc649d92 100644 --- a/xts5/Xlib14/XwcTextPerCharExtents.m +++ b/xts5/Xlib14/XwcTextPerCharExtents.m @@ -146,7 +146,6 @@ extents of the characters. Make sure the returned status is good. #if XT_X_RELEASE > 4 Display *dpy; char *plocale; -char *fontset; char *font_list; XFontSet pfs; char *defstr; @@ -154,7 +153,7 @@ int missing_cnt; char **missing_chars; XFontSetExtents *ext; int escapement; -int nbytes,nchars,maxescape; +int nchars, maxescape; Status status; XRectangle ink[MAX_CHARS]; XRectangle logical[MAX_CHARS]; diff --git a/xts5/Xlib14/XwcTextPropertyToTextList.m b/xts5/Xlib14/XwcTextPropertyToTextList.m index a89c5663..1552f1eb 100644 --- a/xts5/Xlib14/XwcTextPropertyToTextList.m +++ b/xts5/Xlib14/XwcTextPropertyToTextList.m @@ -90,12 +90,6 @@ int x_init, *****/ mod_stat() { - extern Display *dpy_save; - extern Window wid_save; - extern Pixmap pid_save; - extern GC gc_save; - extern XWindowAttributes wat_save; - /* * insert modifications to saved data here */ @@ -120,7 +114,6 @@ int x_init, extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -128,11 +121,8 @@ int x_init, ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; Status ret_status ; - wchar_t *s ; - int ss_status, /* save stat return status */ stat_status, /* check stat return status */ diff --git a/xts5/Xlib15/XDefaultString.m b/xts5/Xlib15/XDefaultString.m index 6245fb09..05731ff6 100644 --- a/xts5/Xlib15/XDefaultString.m +++ b/xts5/Xlib15/XDefaultString.m @@ -78,19 +78,14 @@ Display *display ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; char *ret_status ; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, - i1; + cleanup_status; regr_args.l_flags.bufrout = 1; diff --git a/xts5/Xlib15/XFreeStringList.m b/xts5/Xlib15/XFreeStringList.m index f39b43e5..077747df 100644 --- a/xts5/Xlib15/XFreeStringList.m +++ b/xts5/Xlib15/XFreeStringList.m @@ -121,7 +121,6 @@ char *str3 = "TestString3"; int argc = 3; char *argv[3]; int rargc; -int rargc1; char **rargv = (char **) NULL; char **rargv1 = (char **) NULL; Window w; diff --git a/xts5/Xlib15/XGetIconName.m b/xts5/Xlib15/XGetIconName.m index b31ce002..7c533f5b 100644 --- a/xts5/Xlib15/XGetIconName.m +++ b/xts5/Xlib15/XGetIconName.m @@ -132,9 +132,6 @@ Window win; char *iconname = "Xtest Icon Name"; char *iconnameret; Status status; -char **list_return; -int count_return; -XTextProperty tp, rtp; XVisualInfo *vp; resetvinf(VI_WIN); @@ -197,8 +194,6 @@ Verify that the returned name was set to NULL. char *iconnameret = "XTestUninit"; char *name = "XTestIconName"; Status status; -char **list_return; -int count_return; XVisualInfo *vp; resetvinf(VI_WIN); diff --git a/xts5/Xlib15/XGetTextProperty.m b/xts5/Xlib15/XGetTextProperty.m index c2615936..f9742915 100644 --- a/xts5/Xlib15/XGetTextProperty.m +++ b/xts5/Xlib15/XGetTextProperty.m @@ -246,8 +246,6 @@ Verify that in the returned structure the encoding field was none, >>CODE Window win; Status status; -char **list_return; -int count_return; XTextProperty tp; XVisualInfo *vp; diff --git a/xts5/Xlib15/XGetWMColormapWindows.m b/xts5/Xlib15/XGetWMColormapWindows.m index 3dd05748..7d8d7cef 100644 --- a/xts5/Xlib15/XGetWMColormapWindows.m +++ b/xts5/Xlib15/XGetWMColormapWindows.m @@ -134,7 +134,6 @@ Verify that the value of the property is correct. Release the allocated memory using XFree. >>CODE Status status; -Window rwin; XVisualInfo *vp; int nwins = 7; Window pwins[7]; diff --git a/xts5/Xlib15/XGetWMName.m b/xts5/Xlib15/XGetWMName.m index 99e39424..a7c848d9 100644 --- a/xts5/Xlib15/XGetWMName.m +++ b/xts5/Xlib15/XGetWMName.m @@ -244,8 +244,6 @@ Verify that in the returned XTextProperty structure the encoding field was none, >>CODE Window win; Status status; -char **list_return; -int count_return; XTextProperty tp; XVisualInfo *vp; diff --git a/xts5/Xlib15/XIconifyWindow.m b/xts5/Xlib15/XIconifyWindow.m index f79da8af..4af6f67f 100644 --- a/xts5/Xlib15/XIconifyWindow.m +++ b/xts5/Xlib15/XIconifyWindow.m @@ -151,7 +151,6 @@ XEvent ev, rev; int i; int nevents = 0; XVisualInfo *vp; -XWindowAttributes watts; unsigned long event_mask[2]; resetvinf(VI_WIN); diff --git a/xts5/Xlib15/XReconfigureWMWindow.m b/xts5/Xlib15/XReconfigureWMWindow.m index de55eaf1..fb4febed 100644 --- a/xts5/Xlib15/XReconfigureWMWindow.m +++ b/xts5/Xlib15/XReconfigureWMWindow.m @@ -327,8 +327,6 @@ Configure the window to have a width of zero using XReconfigureWMWindow Verify that a BadValue error was generated. >>CODE BadValue Status status; -XEvent ev; -int nevents = 0; XVisualInfo *vp; XWindowChanges changes; diff --git a/xts5/Xlib15/XSetClassHint.m b/xts5/Xlib15/XSetClassHint.m index d044c676..4823bea1 100644 --- a/xts5/Xlib15/XSetClassHint.m +++ b/xts5/Xlib15/XSetClassHint.m @@ -138,7 +138,7 @@ Verify that the value is correct. >>CODE Window win; XVisualInfo *vp; -XClassHint classhint, retchint; +XClassHint classhint; int reslen; char *propp = NULL, *s; unsigned long leftover, nitems, len; diff --git a/xts5/Xlib15/XSetCommand.m b/xts5/Xlib15/XSetCommand.m index 3854d8cd..f2c8a43f 100644 --- a/xts5/Xlib15/XSetCommand.m +++ b/xts5/Xlib15/XSetCommand.m @@ -146,16 +146,10 @@ Verify that the number and value of the returned strings is correct. Release the allocated memory using XFreeStringList. >>CODE XVisualInfo *vp; -char *nullstr = "<NULL>"; -char **strpp, *strp; char *str1 = "XTest string 1"; char *str2 = "XTest string 2"; char *prop[2]; -char **rstrings = (char**) NULL; -int rcount = 0; -int i; XTextProperty rtp; -Status status; char **list_return; int count_return; int len; diff --git a/xts5/Xlib15/XSetTransientForHint.m b/xts5/Xlib15/XSetTransientForHint.m index 67459706..068ae5e5 100644 --- a/xts5/Xlib15/XSetTransientForHint.m +++ b/xts5/Xlib15/XSetTransientForHint.m @@ -128,7 +128,7 @@ Verify that the property value was correct. Window win, pwin; XVisualInfo *vp; Window *retwin = (Window *) NULL; -unsigned long leftover, nitems, len; +unsigned long leftover, nitems; int actual_format; Atom actual_type; diff --git a/xts5/Xlib15/XSetWMClientMachine.m b/xts5/Xlib15/XSetWMClientMachine.m index 332bc4da..3c5cdbc1 100644 --- a/xts5/Xlib15/XSetWMClientMachine.m +++ b/xts5/Xlib15/XSetWMClientMachine.m @@ -142,7 +142,6 @@ Release the allocated memory using XFree. Window win; char *str1 = "Xtest Client Machine String"; char *str[1]; -Status status; char **list_return; int count_return; XTextProperty tp, rtp; diff --git a/xts5/Xlib15/XSetWMColormapWindows.m b/xts5/Xlib15/XSetWMColormapWindows.m index 2a2856eb..76891b4a 100644 --- a/xts5/Xlib15/XSetWMColormapWindows.m +++ b/xts5/Xlib15/XSetWMColormapWindows.m @@ -135,7 +135,6 @@ Verify that the returned number of elements was correct. Verify that the property value was correct. >>CODE Status status; -Window rwin; XVisualInfo *vp; Atom xa_wm_colormap_windows; Atom actual_type; @@ -146,7 +145,6 @@ int nwins = 7; Window pwins[7]; Window *rwins = (Window *) NULL; Window *wp; -int rcnt = 0; int i; for(i=0; i<nwins; i++) diff --git a/xts5/Xlib15/XSetWMIconName.m b/xts5/Xlib15/XSetWMIconName.m index ba94cd36..3945b59a 100644 --- a/xts5/Xlib15/XSetWMIconName.m +++ b/xts5/Xlib15/XSetWMIconName.m @@ -140,7 +140,6 @@ Window win; char *str1 = "Xtest test string1"; char *str2 = "Xtest test string2"; char *str[2]; -Status status; char **list_return; int count_return; XTextProperty tp, rtp; diff --git a/xts5/Xlib15/XSetWMName.m b/xts5/Xlib15/XSetWMName.m index fdacf537..52895f95 100644 --- a/xts5/Xlib15/XSetWMName.m +++ b/xts5/Xlib15/XSetWMName.m @@ -137,7 +137,6 @@ Window win; char *str1 = "Xtest test string1"; char *str2 = "Xtest test string2"; char *str[2]; -Status status; char **list_return; int count_return; XTextProperty tp, rtp; diff --git a/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m index 2b5751ee..32b7edeb 100644 --- a/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m +++ b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m @@ -178,7 +178,6 @@ Window win; char *str1 = "Xtest test string1"; char *str2 = "Xtest test string2"; char *str[2]; -Status status; char **list_return; int count_return; XTextProperty tp, rtp; @@ -285,7 +284,6 @@ Window win; char *str1 = "Xtest test string1"; char *str2 = "Xtest test string2"; char *str[2]; -Status status; char **list_return; int count_return; XTextProperty tp, rtp; @@ -381,16 +379,10 @@ Verify that the number and value of the returned strings is correct. Release the allocated memory using XFreeStringList. >>CODE XVisualInfo *vp; -char *nullstr = "<NULL>"; -char **strpp, *strp; char *str1 = "XTest string 1"; char *str2 = "XTest string 2"; char *prop[2]; -char **rstrings = (char**) NULL; -int rcount = 0; -int i; XTextProperty rtp; -Status status; char **list_return; int count_return; int len; @@ -798,7 +790,7 @@ Verify that the value is correct. >>CODE Window win; XVisualInfo *vp; -XClassHint classhint, retchint; +XClassHint classhint; int reslen; char *propp = NULL, *s; unsigned long leftover, nitems, len; diff --git a/xts5/Xlib15/XSetWMProtocols.m b/xts5/Xlib15/XSetWMProtocols.m index bbb8ab7c..4df7db7a 100644 --- a/xts5/Xlib15/XSetWMProtocols.m +++ b/xts5/Xlib15/XSetWMProtocols.m @@ -137,7 +137,7 @@ Verify that the property value is correct. >>CODE Status status; XVisualInfo *vp; -unsigned long leftover, nitems, len; +unsigned long leftover, nitems; int actual_format; Atom actual_type; int nats = 5; diff --git a/xts5/Xlib16/XrmEnumerateDatabase.m b/xts5/Xlib16/XrmEnumerateDatabase.m index ea2a5ead..a94f0c95 100644 --- a/xts5/Xlib16/XrmEnumerateDatabase.m +++ b/xts5/Xlib16/XrmEnumerateDatabase.m @@ -131,22 +131,9 @@ for each resource in the database that would match given name/class resource prefix and return True. >>CODE #if XT_X_RELEASE > 4 - extern int errcnt; - extern int errflg; - extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int - ss_status, /* save stat return status */ - stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; Bool svc_ret_value; char buf[9]; XrmValue resval; @@ -215,22 +202,9 @@ A call to when the called procedure returns True shall return True. >>CODE #if XT_X_RELEASE > 4 - extern int errcnt; - extern int errflg; - extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int - ss_status, /* save stat return status */ - stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; Bool svc_ret_value; char buf[9]; XrmValue resval; @@ -296,22 +270,9 @@ when the called procedure returns False shall terminate the enumeration and return False. >>CODE #if XT_X_RELEASE > 4 - extern int errcnt; - extern int errflg; - extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int - ss_status, /* save stat return status */ - stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; Bool svc_ret_value; char buf[9]; XrmValue resval; diff --git a/xts5/Xlib16/XrmPermStringToQuark.m b/xts5/Xlib16/XrmPermStringToQuark.m index fb8898db..b6cbf1a4 100644 --- a/xts5/Xlib16/XrmPermStringToQuark.m +++ b/xts5/Xlib16/XrmPermStringToQuark.m @@ -82,19 +82,13 @@ char *repr_name; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int ss_status, /* save stat return status */ stat_status, /* check stat return status */ setup_status, - cleanup_status, - i1; + cleanup_status; XrmQuark svc_ret_value; diff --git a/xts5/Xlib16/XrmPutLineResource.m b/xts5/Xlib16/XrmPutLineResource.m index 95f5e9e7..c8af02b9 100644 --- a/xts5/Xlib16/XrmPutLineResource.m +++ b/xts5/Xlib16/XrmPutLineResource.m @@ -394,7 +394,6 @@ Verify that only a single entry was added to the database. char tbuf[256], *tptr; char *type_ret; XrmValue value_ret; -int k; /* Create empty database for testing. */ xplr_database=xrm_create_database(""); @@ -584,7 +583,7 @@ Create empty database for testing. Call xname to test comments. Verify that comments did not affect the database contents. >>CODE -int i,j,k; +int i,j; char tbuf[256], *tptr; /* Create empty database for testing. */ diff --git a/xts5/Xlib17/XClipBox.m b/xts5/Xlib17/XClipBox.m index ae13368a..7fe81186 100644 --- a/xts5/Xlib17/XClipBox.m +++ b/xts5/Xlib17/XClipBox.m @@ -115,7 +115,6 @@ Drawable d; unsigned long fg; { XImage *im; -unsigned long pix; unsigned int width; unsigned int height; int x; diff --git a/xts5/Xlib17/XFetchBytes.m b/xts5/Xlib17/XFetchBytes.m index 719dd94c..7efcde56 100644 --- a/xts5/Xlib17/XFetchBytes.m +++ b/xts5/Xlib17/XFetchBytes.m @@ -121,7 +121,6 @@ Verify that the data is correct. Free the returned data using XFree. >>CODE char *bp; -char *bpr = (char *) NULL; int i; int br; diff --git a/xts5/Xlib17/XGetDefault/XGetDefault.m b/xts5/Xlib17/XGetDefault/XGetDefault.m index 1a4abf4c..773d5021 100644 --- a/xts5/Xlib17/XGetDefault/XGetDefault.m +++ b/xts5/Xlib17/XGetDefault/XGetDefault.m @@ -152,7 +152,6 @@ Verify that the returned value is \"OPT\". unsigned char *pval = (unsigned char *) "VAL*VAl\nXT.LEO:CAL\nXT.OPT:VAL\nXT.Bezoomny:Cal\n"; char *valstr; char *res = (char *) NULL; -Display *client; valstr = "VAL"; @@ -195,7 +194,6 @@ Verify that the call returned NULL. unsigned char *pval = (unsigned char *) "XT.LEO:CAL\nXT.OPT:VAL\nXT.Bezoomny:Cal\n"; char *nullstr = "<NULL>"; char *res = (char *) NULL; -Display *client; XChangeProperty (Dsp, RootWindow(Dsp, 0), XA_RESOURCE_MANAGER, XA_STRING, 8, PropModeReplace, pval, 1+strlen((char *)pval)); diff --git a/xts5/Xlib17/XIntersectRegion.m b/xts5/Xlib17/XIntersectRegion.m index f3fc4914..89b88af4 100644 --- a/xts5/Xlib17/XIntersectRegion.m +++ b/xts5/Xlib17/XIntersectRegion.m @@ -130,7 +130,6 @@ Set two of the regions to disjoint polygons using XPolygonRegion. Obtain the intersection of the regions using xname. Verify that the returned region was empty using XEmptyRegion. >>CODE -static XPoint noninter1[] = { {-25,-5}, {-15,-10}, {-10,-25}, {-20,-35}, {-30,-30}, {-35,-20}, {-30,-10} }; static XPoint inter1[] = { {25,5}, {15,10}, {10,25}, {20,35}, {30,30}, {35,20}, {30,10} }; static XPoint inter2[] = { {25,20}, {37,22}, {40,30}, {35,37}, {30,40}, {25,38}, {18,32}, {20,25} }; Region R1; diff --git a/xts5/Xlib17/XKeycodeToKeysym.m b/xts5/Xlib17/XKeycodeToKeysym.m index 5ddbbc5a..aa41d03b 100644 --- a/xts5/Xlib17/XKeycodeToKeysym.m +++ b/xts5/Xlib17/XKeycodeToKeysym.m @@ -182,7 +182,6 @@ Verify that the call returned NoSymbol. int maxi,mini; KeyCode maxkc, minkc; KeySym ks; -int kspkc; XDisplayKeycodes(display, &mini, &maxi); minkc = (KeyCode)mini; diff --git a/xts5/Xlib17/XLookupKeysym.m b/xts5/Xlib17/XLookupKeysym.m index d727054e..c44709ae 100644 --- a/xts5/Xlib17/XLookupKeysym.m +++ b/xts5/Xlib17/XLookupKeysym.m @@ -125,7 +125,6 @@ For each KeyCode and index: >>CODE int minkc, maxkc; int syms_per_kc; -KeyCode kc; KeySym ks, res; KeySym *keysyms; XKeyEvent ke; diff --git a/xts5/Xlib17/XPolygonRegion.m b/xts5/Xlib17/XPolygonRegion.m index e5d55cfd..c72603d4 100644 --- a/xts5/Xlib17/XPolygonRegion.m +++ b/xts5/Xlib17/XPolygonRegion.m @@ -146,14 +146,12 @@ For a convex, concave and complex polygon : Verify that the entire drawable is W_BG. >>CODE int loop; -XImage im; XVisualInfo *vi; Region reg; Window win; GC gc; unsigned int width; unsigned int height; -int x; resetvinf(VI_WIN); nextvinf(&vi); diff --git a/xts5/Xlib17/XReadBitmapFile.m b/xts5/Xlib17/XReadBitmapFile.m index 22bc5a81..a25ff795 100644 --- a/xts5/Xlib17/XReadBitmapFile.m +++ b/xts5/Xlib17/XReadBitmapFile.m @@ -238,7 +238,6 @@ Create a valid, readable, bitmap file. Call xname to read the bitmap file. Verify that BitmapSuccess was returned. >>CODE -int ret; /* Create a valid, readable, bitmap file. */ if (xrbf_create(filename, xrbf_two, xrbf_n_two)) { @@ -276,7 +275,7 @@ Verify that the bitmap was of the correct height, width and depth. Verify that the bitmap contents were correct. Verify that the bitmap was created on the correct screen. >>CODE -Window w_tmp, rw_ret, rw2_ret; +Window rw_ret, rw2_ret; int i_tmp; unsigned int h_ret, w_ret, d_ret, ui_tmp; @@ -372,9 +371,6 @@ Call xname to read the bitmap file. Verify that the x_hot_return was returned as expected. Verify that the y_hot_return was returned as expected. >>CODE -Window w_tmp; -int i_tmp; -unsigned int h_ret, w_ret, d_ret, ui_tmp; /* Create a valid, readable, bitmap file containing a hotspot. */ if (xrbf_create(filename, xrbf_two, xrbf_n_two)) { @@ -428,9 +424,6 @@ Call xname to read the bitmap file. Verify that the x_hot_return was returned as expected. Verify that the y_hot_return was returned as expected. >>CODE -Window w_tmp; -int i_tmp; -unsigned int h_ret, w_ret, d_ret, ui_tmp; /* Create a valid, readable, bitmap file containing no hotspot. */ if (xrbf_create(filename, xrbf_one, xrbf_n_one)) { diff --git a/xts5/Xlib17/XRebindKeysym.m b/xts5/Xlib17/XRebindKeysym.m index 14061dfe..143d82dd 100644 --- a/xts5/Xlib17/XRebindKeysym.m +++ b/xts5/Xlib17/XRebindKeysym.m @@ -157,7 +157,6 @@ XKeyEvent ev; char *astring = "Bound String"; char *modstring = "String to bind to modified key"; static char rstring[MAXRES] = "UninitializedBoundString."; -int bb; KeySym ksr; KeySym modlist[5]; KeySym keylist[6]; diff --git a/xts5/Xlib17/XRefreshKeyboardMapping.m b/xts5/Xlib17/XRefreshKeyboardMapping.m index 5f0275cf..58e16738 100644 --- a/xts5/Xlib17/XRefreshKeyboardMapping.m +++ b/xts5/Xlib17/XRefreshKeyboardMapping.m @@ -142,8 +142,7 @@ Reset the keycode to map onto XK_a using XChangeKeyboardMapping. >>CODE XEvent ev; KeyCode kc; -KeySym ks, res, old, new; -XKeyEvent ke; +KeySym res, old, new; old = XK_a; new = XK_b; @@ -217,10 +216,7 @@ Await the mapping event. Update the modifier mappings using xname. Release the map storage using XFreeModifiermap. >>CODE -int i; XEvent ev; -KeyCode *kcptr; -KeyCode *tkcptr; XModifierKeymap *savemap = XGetModifierMapping(Dsp); XModifierKeymap *mmap; @@ -297,14 +293,9 @@ Await the mapping event. Set the request component of the event structure to MappingModifier + MappingKeyboard + MappingPointer Update the modifier mappings using xname. >>CODE -int i; -int set; XEvent ev; XModifierKeymap *savemap = XGetModifierMapping(Dsp); XModifierKeymap *mmap1; -KeyCode minkc; -KeyCode maxkc; -KeyCode *kcp; if(savemap == (XModifierKeymap *) NULL) { delete("XGetModifierMapping() returned NULL."); diff --git a/xts5/Xlib17/XSetRegion.m b/xts5/Xlib17/XSetRegion.m index 8cba748a..de16fc20 100644 --- a/xts5/Xlib17/XSetRegion.m +++ b/xts5/Xlib17/XSetRegion.m @@ -137,7 +137,6 @@ Window win; GC gc; unsigned int width; unsigned int height; -static XRectangle cliprect2 = { 23, 13, 53, 63 }; static XRectangle cliprect = { 0,0, 1,1}; resetvinf(VI_WIN); diff --git a/xts5/Xlib17/XStoreBytes.m b/xts5/Xlib17/XStoreBytes.m index fa0cacd5..528a4d21 100644 --- a/xts5/Xlib17/XStoreBytes.m +++ b/xts5/Xlib17/XStoreBytes.m @@ -117,7 +117,6 @@ Obtain the contents of cut buffer 0 using XFetchBuffer. Verify that the buffer contents is correct. >>CODE char *bp; -char *bpr = (char *) NULL; int i; int br; diff --git a/xts5/Xlib17/XUnionRegion.m b/xts5/Xlib17/XUnionRegion.m index 498a8261..448eeae7 100644 --- a/xts5/Xlib17/XUnionRegion.m +++ b/xts5/Xlib17/XUnionRegion.m @@ -131,7 +131,6 @@ static XPoint tri1[] = { {5,5}, {30,5}, {5,20} }; static XPoint tri2[] = { {5,20}, {30,20}, {30,5} }; static XRectangle rect1 = { 5,5, 25,15}; XRectangle rect2; -XRectangle rrect; R1 = makeregion(); R2 = makeregion(); diff --git a/xts5/Xlib17/XWMGeometry.m b/xts5/Xlib17/XWMGeometry.m index 8564bbdb..96b0e34e 100644 --- a/xts5/Xlib17/XWMGeometry.m +++ b/xts5/Xlib17/XWMGeometry.m @@ -232,7 +232,7 @@ Verify that the returned y-coordinate is DisplayHeight -1 - (base_height + 10 * >>CODE int rval; int xr, yr, wr, hr, gr; -int x, y, w, h, g; +int x, y, w, h; bwidth = 10; szhints.flags= PAllHints|PBaseSize|PWinGravity; diff --git a/xts5/Xlib3/XConnectionNumber.m b/xts5/Xlib3/XConnectionNumber.m index 92db7682..8b9da1ed 100644 --- a/xts5/Xlib3/XConnectionNumber.m +++ b/xts5/Xlib3/XConnectionNumber.m @@ -127,7 +127,6 @@ Display *display; static void closer() { -Window w; int cnn; path_checker = 0; @@ -181,7 +180,6 @@ If the system is POSIX compliant: Otherwise: UNTESTED >>CODE -char *posix; int child_exit; if(config.posix_system == 1) { diff --git a/xts5/Xlib3/XDefaultGCOfScreen.m b/xts5/Xlib3/XDefaultGCOfScreen.m index 68bc1dd9..03806b97 100644 --- a/xts5/Xlib3/XDefaultGCOfScreen.m +++ b/xts5/Xlib3/XDefaultGCOfScreen.m @@ -123,7 +123,6 @@ The default GC has the same depth as the root window of the screen Draw the point (0,0) using the default GC on the default root window. Verify that a BadMatch error did not occur. >>CODE -XWindowAttributes atts; GC dgc; dgc = XCALL; diff --git a/xts5/Xlib3/XDisplayString/Test1.c b/xts5/Xlib3/XDisplayString/Test1.c index 7ecc6cba..c7f498b6 100644 --- a/xts5/Xlib3/XDisplayString/Test1.c +++ b/xts5/Xlib3/XDisplayString/Test1.c @@ -138,7 +138,6 @@ int argc; char *argv[]; { int pass = 0, fail = 0; -char *res_name; char *dispstr; char *rdispstr; Display *display; diff --git a/xts5/Xlib3/XDisplayString/XDisplayString.m b/xts5/Xlib3/XDisplayString/XDisplayString.m index 79c7ed29..8d05a7d9 100644 --- a/xts5/Xlib3/XDisplayString/XDisplayString.m +++ b/xts5/Xlib3/XDisplayString/XDisplayString.m @@ -140,7 +140,6 @@ Obtain the display string using xname. Verify that the value of the string is the parameter used in XOpenDisplay. Close the display using XCloseDisplay. >>CODE -char *dispstr; char *rdispstr; rdispstr = XCALL; @@ -194,7 +193,6 @@ char *argv[2]; char *str; char *dstr; char *mstr = "DISPLAY=%s"; -int pass = 0, fail = 0; if((dstr = getenv("DISPLAY")) == (char *) NULL) { delete("DISPLAY configuration variable is not defined."); diff --git a/xts5/Xlib3/XListDepths.m b/xts5/Xlib3/XListDepths.m index 8a825deb..1b7b13b6 100644 --- a/xts5/Xlib3/XListDepths.m +++ b/xts5/Xlib3/XListDepths.m @@ -126,7 +126,6 @@ int number; int *dlst; int *dptr; int i; -XVisualInfo vp; Pixmap pixm; long notmem[NM_LEN]; diff --git a/xts5/Xlib3/XOpenDisplay/Test1.c b/xts5/Xlib3/XOpenDisplay/Test1.c index 34fc4e07..fe97d992 100644 --- a/xts5/Xlib3/XOpenDisplay/Test1.c +++ b/xts5/Xlib3/XOpenDisplay/Test1.c @@ -139,7 +139,6 @@ int argc; char *argv[]; { int pass = 0, fail = 0; -char *res_name; char *dispstr; char *rdispstr; Display *display; diff --git a/xts5/Xlib4/XCreateWindow/XCreateWindow.m b/xts5/Xlib4/XCreateWindow/XCreateWindow.m index dd9d0ebd..c64920d8 100644 --- a/xts5/Xlib4/XCreateWindow/XCreateWindow.m +++ b/xts5/Xlib4/XCreateWindow/XCreateWindow.m @@ -462,7 +462,6 @@ Select NoEventMask on parent window. Verify that a single CreateNotify event was generated. Verify that the returned event structure was correct. >>CODE -XSetWindowAttributes atts; XCreateWindowEvent ge; XEvent event; Window win; diff --git a/xts5/Xlib4/XMapRaised/XMapRaised.m b/xts5/Xlib4/XMapRaised/XMapRaised.m index 9950d022..938427ac 100644 --- a/xts5/Xlib4/XMapRaised/XMapRaised.m +++ b/xts5/Xlib4/XMapRaised/XMapRaised.m @@ -136,7 +136,6 @@ Verify that window is at top of stacking order. >>CODE int so; Window base; -struct buildtree *btp; struct buildtree *btlist; XWindowAttributes atts; @@ -305,7 +304,6 @@ XWindowAttributes atts; XMapRequestEvent good; XEvent ev; struct area area; -int n; base = defwin(display); setarea(&area, 20, 20, 40, 40); @@ -384,7 +382,6 @@ struct area area; struct area charea; int origso; XEvent ev; -int n; base = defwin(display); setarea(&area, 20, 20, 40, 40); @@ -477,7 +474,6 @@ XConfigureEvent confgood; XMapEvent mapgood; struct buildtree *btlist; struct buildtree *btp; -struct area area; XEvent ev; int gotmap; int gotconf; @@ -650,7 +646,6 @@ XConfigureEvent confgood; XMapEvent mapgood; struct buildtree *btlist; struct buildtree *btp; -struct area area; XEvent ev; int gotmap; int gotconf; diff --git a/xts5/Xlib4/XSetWindowBackground.m b/xts5/Xlib4/XSetWindowBackground.m index 739f9792..ccdfcf37 100644 --- a/xts5/Xlib4/XSetWindowBackground.m +++ b/xts5/Xlib4/XSetWindowBackground.m @@ -162,7 +162,6 @@ Verify that background has not changed. Pixmap pm; XEvent event; XVisualInfo *vp; -XSetWindowAttributes attributes; for(resetvinf(VI_WIN); nextvinf(&vp); ) { parent = makewin(display, vp); diff --git a/xts5/Xlib4/XSetWindowBorder.m b/xts5/Xlib4/XSetWindowBorder.m index de4e2cd8..767d3788 100644 --- a/xts5/Xlib4/XSetWindowBorder.m +++ b/xts5/Xlib4/XSetWindowBorder.m @@ -136,7 +136,6 @@ Get the border-pixel. Verify the border pixel was set. >>CODE unsigned long pixel; -Pixmap pm; XEvent event; parent = defdraw(display, VI_WIN); @@ -192,7 +191,6 @@ Get the border-pixel. Verify the border pixel was set. >>CODE unsigned long pixel; -Pixmap pm; XEvent event; /* Create windows */ diff --git a/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m b/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m index 00357f63..a73f6bf6 100644 --- a/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m +++ b/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m @@ -203,7 +203,6 @@ Set child window border-pixmap to CopyFromParent. Ensure that window is mapped. Pixmap verify to check that border is correct. >>CODE -Pixmap pm; XVisualInfo *vp; for (resetvinf(VI_WIN); nextvinf(&vp); ) { diff --git a/xts5/Xlib4/XSetWindowColormap.m b/xts5/Xlib4/XSetWindowColormap.m index 39c8b9ac..0ffb44a3 100644 --- a/xts5/Xlib4/XSetWindowColormap.m +++ b/xts5/Xlib4/XSetWindowColormap.m @@ -158,7 +158,6 @@ For each supported visual: Verify that a call to XSetWindowColormap generates a BadMatch error. >>CODE BadMatch XVisualInfo *vi; -XWindowAttributes watts; int i, nvisuals; Visual **visuals; diff --git a/xts5/Xlib4/XUndefineCursor.m b/xts5/Xlib4/XUndefineCursor.m index 5ebee314..86c2ecd6 100644 --- a/xts5/Xlib4/XUndefineCursor.m +++ b/xts5/Xlib4/XUndefineCursor.m @@ -270,7 +270,6 @@ Otherwise: >>CODE Window altroot; Cursor cursor; -XVisualInfo *vp; Bool samedefcursor; /* If extended testing is required: */ diff --git a/xts5/Xlib5/XInternAtom.m b/xts5/Xlib5/XInternAtom.m index 241c6417..1bd3d1d0 100644 --- a/xts5/Xlib5/XInternAtom.m +++ b/xts5/Xlib5/XInternAtom.m @@ -478,7 +478,6 @@ Atom atom_return; /* Open a new connection to the server. */ Dsp = XOpenDisplay(config.display); if (Dsp == (Display *)NULL) { - int i; delete("Could not open display"); cancelrest("Could not open display"); return; diff --git a/xts5/Xlib6/XCreateFontCursor.m b/xts5/Xlib6/XCreateFontCursor.m index 0dc584bd..642874cb 100644 --- a/xts5/Xlib6/XCreateFontCursor.m +++ b/xts5/Xlib6/XCreateFontCursor.m @@ -158,7 +158,6 @@ Get TET variable XT_FONTCURSOR_BAD. Call XCreateFontCursor with shape of this value. Verify that a BadValue error occurs. >>CODE BadValue -Cursor qstat; /* Get TET variable XT_FONTCURSOR_BAD */ shape = config.fontcursor_bad; diff --git a/xts5/Xlib6/XCreateGlyphCursor.m b/xts5/Xlib6/XCreateGlyphCursor.m index 29350924..200acac0 100644 --- a/xts5/Xlib6/XCreateGlyphCursor.m +++ b/xts5/Xlib6/XCreateGlyphCursor.m @@ -620,7 +620,6 @@ Call XCreateGlyphCursor with a source_char which is an undefined glyph in source_font. Verify that a BadValue error occurs. >>CODE BadValue -Cursor qstat; /* Load xtfont0 using XLoadFont. */ source_font = XLoadFont(display, xtfont0); @@ -653,7 +652,6 @@ Call XCreateGlyphCursor with a mask_char which is an undefined glyph in mask_font. Verify that a BadValue error occurs. >>CODE BadValue -Cursor qstat; /* Load xtfont0 using XLoadFont. */ source_font = XLoadFont(display, xtfont0); diff --git a/xts5/Xlib6/XCreatePixmap.m b/xts5/Xlib6/XCreatePixmap.m index b866f106..84c725bb 100644 --- a/xts5/Xlib6/XCreatePixmap.m +++ b/xts5/Xlib6/XCreatePixmap.m @@ -124,7 +124,7 @@ XVisualInfo *vp; Status gstat; Window root_ret; int x_ret, y_ret; -unsigned int w_ret, h_ret, bw_ret, bh_ret, dep_ret; +unsigned int w_ret, h_ret, bw_ret, dep_ret; Pixmap pmap; diff --git a/xts5/Xlib6/XCreatePixmapCursor.m b/xts5/Xlib6/XCreatePixmapCursor.m index 5f8946ec..b33e122c 100644 --- a/xts5/Xlib6/XCreatePixmapCursor.m +++ b/xts5/Xlib6/XCreatePixmapCursor.m @@ -414,7 +414,6 @@ Call XCreatePixmapCursor with source pixmap. Verify that BadMatch error occurred. >>CODE BadMatch XVisualInfo *vp; -Cursor qstat; depth1.depth = 1; /* If only one depth supported report UNSUPPORTED. */ @@ -460,7 +459,6 @@ Call XCreatePixmapCursor with mask pixmap. Verify that BadMatch error occurred. >>CODE BadMatch XVisualInfo *vp; -Cursor qstat; depth1.depth = 1; /* If only one depth supported report UNSUPPORTED. */ @@ -507,7 +505,6 @@ Create mask pixmap of size 2x2. Call XCreatePixmapCursor with mask pixmap. Verify that BadMatch error occurred. >>CODE BadMatch -Cursor qstat; depth1.depth = 1; /* Create source pixmap of size 1x1. */ @@ -538,7 +535,6 @@ Create mask pixmap. Call XCreatePixmapCursor with hotspot outside the source pixmap. Verify that BadMatch error occurred. >>CODE BadMatch -Cursor qstat; depth1.depth = 1; /* Create source pixmap. */ diff --git a/xts5/Xlib6/XFreePixmap.m b/xts5/Xlib6/XFreePixmap.m index e1e0aaf7..f961d7a1 100644 --- a/xts5/Xlib6/XFreePixmap.m +++ b/xts5/Xlib6/XFreePixmap.m @@ -114,7 +114,6 @@ For all supported depths of pixmap: Plot (0,0) in the pixmap. Verify that a BadDrawable error occurred. >>CODE -XGCValues gcv; XVisualInfo *vp; GC gc; @@ -150,7 +149,7 @@ Verify that the tiled pattern matches the pixmap. Window win; XVisualInfo *vp; XGCValues gcv; -GC gc, gc2; +GC gc; for(resetvinf(VI_WIN); nextvinf(&vp);) { win = makewin(display, vp); diff --git a/xts5/Xlib7/XAllocColorCells.m b/xts5/Xlib7/XAllocColorCells.m index f480a312..c36576f0 100644 --- a/xts5/Xlib7/XAllocColorCells.m +++ b/xts5/Xlib7/XAllocColorCells.m @@ -140,10 +140,8 @@ For each visual class DirectColor, PseudoColor and GrayScale: >>CODE XVisualInfo *vp; XColor color, qcolor; -Visual *visual; Status status; -Colormap cmap; -unsigned long vmask, pmask, mask, planemask; +unsigned long vmask, mask, planemask; int i, j, k, cells; int pathcnt; @@ -314,9 +312,7 @@ For each supported visual with r/w colour cells: Verify that the bitwise AND of the planemask and the OR of the colours is 0. >>CODE XVisualInfo *vp; -Visual *visual; Status status; -Colormap cmap; unsigned long vmask, planemask, pixelmask; int i, j, cells, pathcnt = 0; @@ -410,9 +406,7 @@ For the visuals PseudoColor and GrayScale: Verify that the number of bits set in each planemask is exactly 1. >>CODE XVisualInfo *vp; -Visual *visual; Status status; -Colormap cmap; unsigned long vmask; int j, cells, pathcnt = 0; @@ -486,9 +480,7 @@ For the visual class DirectColor: Verify that for each planemask exactly three bits are set. >>CODE XVisualInfo *vp; -Visual *visual; Status status; -Colormap cmap; unsigned long vmask; int j, cells; @@ -571,9 +563,7 @@ For the visual types PseudoColor and GreyScale: Verify that the returned planemasks were contiguous. >>CODE XVisualInfo *vp; -Visual *visual; Status status; -Colormap cmap; unsigned long vmask; unsigned long planeor; int j, cells; @@ -663,11 +653,8 @@ For the visual class DirectColor: were contiguous and distinct. >>CODE XVisualInfo *vp; -Visual *visual; Status status; -Colormap cmap; unsigned long vmask; -unsigned long planeor; int j, cells; diff --git a/xts5/Xlib7/XAllocColorPlanes.m b/xts5/Xlib7/XAllocColorPlanes.m index 68a23064..a6eac84a 100644 --- a/xts5/Xlib7/XAllocColorPlanes.m +++ b/xts5/Xlib7/XAllocColorPlanes.m @@ -165,7 +165,6 @@ For visual class DirectColor: >>CODE XVisualInfo *vp; unsigned long vmask = (1<<DirectColor); -unsigned long *pixm, *rr, *gr, *br; unsigned long rm, gm, bm, pm, rgbmask, pixel, r, g, b; XColor color, qcolor; Status status; @@ -333,7 +332,6 @@ For the visual class DirectColor: >>CODE XVisualInfo *vp; unsigned long vmask = (1<<DirectColor); -unsigned long *pixm, *rr, *gr, *br; unsigned long rm, gm, bm, pm, rgbmask; unsigned long pm_array[3], i; Status status; @@ -490,8 +488,7 @@ For the visual class DirectColor: >>CODE XVisualInfo *vp; unsigned long vmask = (1<<DirectColor); -unsigned long *pixm, *rr, *gr, *br; -unsigned long rm, gm, bm, pm, rgbmask, pixel, i; +unsigned long rm, gm, bm, pm; Status status; int cells; @@ -565,9 +562,7 @@ For the visual class DirectColor: >>CODE XVisualInfo *vp; unsigned long vmask = (1<<DirectColor); -unsigned long *pixm, *rr, *gr, *br; -unsigned long rm, gm, bm, pm, rgbmask, pixel, i; -XColor color; +unsigned long rm, gm, bm, pm; Status status; int cells; @@ -635,7 +630,6 @@ For all supported visual classes: Call XAllocColorPlanes with ncolors = 0. >>CODE BadValue XVisualInfo *vp; -Visual *visual; unsigned long vmask = (1<<DirectColor); if( (vmask = visualsupported(display, vmask)) == 0L) { diff --git a/xts5/Xlib7/XAllocNamedColor.m b/xts5/Xlib7/XAllocNamedColor.m index 8785afe5..67f2602f 100644 --- a/xts5/Xlib7/XAllocNamedColor.m +++ b/xts5/Xlib7/XAllocNamedColor.m @@ -163,7 +163,6 @@ char *goodname; Status status; XColor screencol, exactcol, testcol; unsigned long vmask; -unsigned short trunc; if( (vmask = visualsupported(display, 0L)) == 0L) { delete("No visuals reported as valid."); @@ -241,9 +240,8 @@ For each supported visual type: XVisualInfo *vp; char *goodname; Status status; -XColor screencol, exactcol, testcol; +XColor screencol, exactcol; unsigned long vmask; -unsigned short trunc; if( (vmask = visualsupported(display, 0L)) == 0L) { delete("No visuals reported as valid."); @@ -287,9 +285,8 @@ For each supported visual type: XVisualInfo *vp; char *badname; Status status; -XColor screencol, exactcol, testcol; +XColor screencol, exactcol; unsigned long vmask; -unsigned short trunc; if( (vmask = visualsupported(display, 0L)) == 0L) { delete("No visuals reported as valid."); @@ -342,7 +339,6 @@ char *cp, *goodname, *casename; Status status; XColor screencol, exactcol, alscreencol, alexactcol; unsigned long vmask; -unsigned short trunc; int i; if( (vmask = visualsupported(display, 0L)) == 0L) { diff --git a/xts5/Xlib7/XCopyColormapAndFree.m b/xts5/Xlib7/XCopyColormapAndFree.m index d31bd823..1488e261 100644 --- a/xts5/Xlib7/XCopyColormapAndFree.m +++ b/xts5/Xlib7/XCopyColormapAndFree.m @@ -121,11 +121,9 @@ XVisualInfo *vp; unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); XColor *cellmap, *cellptr; XColor cell; -unsigned long l; unsigned int i; -int pathcnt = 0, size; -XColor color, color1, color2, ncol1, ncol2; -Display *disp2; +int size; +XColor color1, color2; if( (vmask = visualsupported(display, vmask)) == 0L) { @@ -233,7 +231,6 @@ unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); XColor *cellmap, *cellptr; XColor cell; unsigned long l; -int i; int pathcnt = 0; int size; @@ -360,12 +357,9 @@ static Bool check_rgb(dpy, cmap, xcp) Colormap testcmap; XVisualInfo *vp; unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); -XColor *cellmap, *cellptr; -XColor cell; -unsigned long l; int i; -int pathcnt = 0, size; -XColor color, ncol1, ncol2, cols[4]; +int size; +XColor cols[4]; Display *disp2; unsigned long pix[2]; unsigned long *copypix; diff --git a/xts5/Xlib7/XCreateColormap.m b/xts5/Xlib7/XCreateColormap.m index 6a744b4a..272b6f00 100644 --- a/xts5/Xlib7/XCreateColormap.m +++ b/xts5/Xlib7/XCreateColormap.m @@ -121,9 +121,6 @@ For each visual type >>CODE XVisualInfo *vp; Colormap cmap; -Display *d2; -Window w2; -int i; alloc = AllocNone; @@ -431,10 +428,9 @@ For the visual Directcolor: Colormap cmap; XVisualInfo *vi; XColor colarr[NUM_COLS]; -unsigned long plane, count; -unsigned long vmask = (1L<<DirectColor), b, planemask; -int n, i, j, bitsum; -int bitpos[sizeof(long) * 8]; +unsigned long count; +unsigned long vmask = (1L<<DirectColor); +int n, i, bitsum; if( (vmask = visualsupported(display, vmask)) == 0L) { diff --git a/xts5/Xlib7/XFreeColormap.m b/xts5/Xlib7/XFreeColormap.m index 16b8c4ce..8e43d87a 100644 --- a/xts5/Xlib7/XFreeColormap.m +++ b/xts5/Xlib7/XFreeColormap.m @@ -247,11 +247,9 @@ For each supported visual class: Verify that a ColorMapnotify event was generated with XNextEvent. Verify that the window's colourmap is set to none with XGetWindowAttributes. >>CODE -int i, len, notfound; XVisualInfo *vi; XWindowAttributes watts; XEvent ev; -Colormap *maplist; unsigned long vmask; XColor col; Window win; diff --git a/xts5/Xlib7/XLookupColor.m b/xts5/Xlib7/XLookupColor.m index 36296bba..df597cae 100644 --- a/xts5/Xlib7/XLookupColor.m +++ b/xts5/Xlib7/XLookupColor.m @@ -223,7 +223,6 @@ char *cp, *goodname, *casename; Status status; XColor screencol, exactcol, alscreencol, alexactcol; unsigned long vmask; -unsigned short trunc; int i; if( (vmask = visualsupported(display, 0L)) == 0L) { diff --git a/xts5/Xlib7/XParseColor.m b/xts5/Xlib7/XParseColor.m index 5d3bcc02..a691de1a 100644 --- a/xts5/Xlib7/XParseColor.m +++ b/xts5/Xlib7/XParseColor.m @@ -411,7 +411,6 @@ Verify that the flags component of the returned XColor structure was DoRed|DoGre >>CODE Status ret; char flags; -XColor dcol; spec = "#000"; ret = XCALL; @@ -496,11 +495,7 @@ then a call to xname returns zero. Parse the string XT_BAD_COLORNAME using xname. Verify that the call returns zero. >>CODE -char *ptr; -char *str; Status result; -XColor dcol; -unsigned short red, green, blue; spec = config.bad_colorname; result = XCALL; diff --git a/xts5/Xlib7/XStoreNamedColor.m b/xts5/Xlib7/XStoreNamedColor.m index af333d0d..03dd35b1 100644 --- a/xts5/Xlib7/XStoreNamedColor.m +++ b/xts5/Xlib7/XStoreNamedColor.m @@ -299,7 +299,6 @@ XVisualInfo *vp; char *cp, *goodname, *casename; XColor casecol, testcol; unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); -unsigned short trunc; int i; if( (vmask = visualsupported(display, vmask)) == 0L) { @@ -375,7 +374,6 @@ For each visual class DirectColor, PseudoColor and GrayScale: >>CODE BadValue XVisualInfo *vp; char *goodname; -XColor namedcol, testcol, storedcol; unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); if( (vmask = visualsupported(display, vmask)) == 0L) { @@ -498,7 +496,6 @@ For the visual classes DirectColor, PseudoColor and GrayScale : >>CODE BadName XVisualInfo *vp; char *badname; -Status status; unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale); if( (vmask = visualsupported(display, vmask)) == 0L) { diff --git a/xts5/Xlib7/XcmsAddColorSpace.m b/xts5/Xlib7/XcmsAddColorSpace.m index f8bb6e18..e38e28f2 100644 --- a/xts5/Xlib7/XcmsAddColorSpace.m +++ b/xts5/Xlib7/XcmsAddColorSpace.m @@ -101,7 +101,6 @@ XcmsColorSpace *color_space ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -109,14 +108,11 @@ XcmsColorSpace *color_space ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsAddFunctionSet.m b/xts5/Xlib7/XcmsAddFunctionSet.m index 246e82df..cadc870f 100644 --- a/xts5/Xlib7/XcmsAddFunctionSet.m +++ b/xts5/Xlib7/XcmsAddFunctionSet.m @@ -130,13 +130,10 @@ XcmsFunctionSet *function_set ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsAllocColor.m b/xts5/Xlib7/XcmsAllocColor.m index c353f804..7ad4710b 100644 --- a/xts5/Xlib7/XcmsAllocColor.m +++ b/xts5/Xlib7/XcmsAllocColor.m @@ -108,15 +108,11 @@ extern int unexp_err(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; -int skip_pixcheck; -int red, green, blue; int tmpRGB; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsAllocNamedColor.m b/xts5/Xlib7/XcmsAllocNamedColor.m index d163821d..ebcb46d4 100644 --- a/xts5/Xlib7/XcmsAllocNamedColor.m +++ b/xts5/Xlib7/XcmsAllocNamedColor.m @@ -121,14 +121,11 @@ XcmsColorFormat format ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCCCOfColormap.m b/xts5/Xlib7/XcmsCCCOfColormap.m index 7592b87e..363a61f1 100644 --- a/xts5/Xlib7/XcmsCCCOfColormap.m +++ b/xts5/Xlib7/XcmsCCCOfColormap.m @@ -106,7 +106,6 @@ Colormap colormap ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -114,14 +113,11 @@ Colormap colormap ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsCCC svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxC.m b/xts5/Xlib7/XcmsCIELabQueryMaxC.m index e42ede59..643238df 100644 --- a/xts5/Xlib7/XcmsCIELabQueryMaxC.m +++ b/xts5/Xlib7/XcmsCIELabQueryMaxC.m @@ -84,19 +84,15 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxL.m b/xts5/Xlib7/XcmsCIELabQueryMaxL.m index 7af686ee..ab9c3e86 100644 --- a/xts5/Xlib7/XcmsCIELabQueryMaxL.m +++ b/xts5/Xlib7/XcmsCIELabQueryMaxL.m @@ -85,7 +85,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -93,14 +92,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxLC.m b/xts5/Xlib7/XcmsCIELabQueryMaxLC.m index 2fb4f539..00f1eee8 100644 --- a/xts5/Xlib7/XcmsCIELabQueryMaxLC.m +++ b/xts5/Xlib7/XcmsCIELabQueryMaxLC.m @@ -85,18 +85,14 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; /****** diff --git a/xts5/Xlib7/XcmsCIELabQueryMinL.m b/xts5/Xlib7/XcmsCIELabQueryMinL.m index b9585434..d93a3126 100644 --- a/xts5/Xlib7/XcmsCIELabQueryMinL.m +++ b/xts5/Xlib7/XcmsCIELabQueryMinL.m @@ -107,7 +107,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -115,14 +114,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxC.m index 458ff145..9bb767a3 100644 --- a/xts5/Xlib7/XcmsCIELuvQueryMaxC.m +++ b/xts5/Xlib7/XcmsCIELuvQueryMaxC.m @@ -110,7 +110,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -118,14 +117,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxL.m b/xts5/Xlib7/XcmsCIELuvQueryMaxL.m index 92de81d2..07801856 100644 --- a/xts5/Xlib7/XcmsCIELuvQueryMaxL.m +++ b/xts5/Xlib7/XcmsCIELuvQueryMaxL.m @@ -110,7 +110,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -118,14 +117,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m index 49cb164b..cb85221f 100644 --- a/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m +++ b/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m @@ -106,7 +106,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -114,14 +113,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsCIELuvQueryMinL.m b/xts5/Xlib7/XcmsCIELuvQueryMinL.m index b66edc64..bb1f9b16 100644 --- a/xts5/Xlib7/XcmsCIELuvQueryMinL.m +++ b/xts5/Xlib7/XcmsCIELuvQueryMinL.m @@ -110,7 +110,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -118,14 +117,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsClientWhitePointOfCCC.m b/xts5/Xlib7/XcmsClientWhitePointOfCCC.m index 4cf6c10b..cf29aee0 100644 --- a/xts5/Xlib7/XcmsClientWhitePointOfCCC.m +++ b/xts5/Xlib7/XcmsClientWhitePointOfCCC.m @@ -103,21 +103,17 @@ extern int errflg; extern int chkflg; extern int signal_status(); extern int unexp_err(); -extern char *svc_user_arg; /****** * local storage ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsColor *svc_ret_value; diff --git a/xts5/Xlib7/XcmsConversionProc.m b/xts5/Xlib7/XcmsConversionProc.m index 61229d43..68a441ee 100644 --- a/xts5/Xlib7/XcmsConversionProc.m +++ b/xts5/Xlib7/XcmsConversionProc.m @@ -92,21 +92,17 @@ unsigned int num ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; /****** * local storage ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsConversionProc2.m b/xts5/Xlib7/XcmsConversionProc2.m index a1e650ab..6db7e626 100644 --- a/xts5/Xlib7/XcmsConversionProc2.m +++ b/xts5/Xlib7/XcmsConversionProc2.m @@ -95,21 +95,17 @@ Bool flags[] ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; /****** * local storage ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsConvertColors.m b/xts5/Xlib7/XcmsConvertColors.m index 5fd79b38..7621eafc 100644 --- a/xts5/Xlib7/XcmsConvertColors.m +++ b/xts5/Xlib7/XcmsConvertColors.m @@ -112,12 +112,10 @@ extern int unexp_err(); ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, cleanup_status, i1; diff --git a/xts5/Xlib7/XcmsCreateCCC.m b/xts5/Xlib7/XcmsCreateCCC.m index b10f9f09..875df6e0 100644 --- a/xts5/Xlib7/XcmsCreateCCC.m +++ b/xts5/Xlib7/XcmsCreateCCC.m @@ -98,7 +98,6 @@ extern int errflg; extern int chkflg; extern int signal_status(); extern int unexp_err(); -extern char *svc_user_arg; extern char *strcpy(); /****** @@ -106,14 +105,11 @@ extern char *strcpy(); ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; -int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsCCC svc_ret_value; diff --git a/xts5/Xlib7/XcmsDefaultCCC.m b/xts5/Xlib7/XcmsDefaultCCC.m index b57de277..680258fc 100644 --- a/xts5/Xlib7/XcmsDefaultCCC.m +++ b/xts5/Xlib7/XcmsDefaultCCC.m @@ -89,7 +89,6 @@ int screen_number ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -97,14 +96,11 @@ int screen_number ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsCCC svc_ret_value; diff --git a/xts5/Xlib7/XcmsDisplayOfCCC.m b/xts5/Xlib7/XcmsDisplayOfCCC.m index 6199abec..5e1a7e83 100644 --- a/xts5/Xlib7/XcmsDisplayOfCCC.m +++ b/xts5/Xlib7/XcmsDisplayOfCCC.m @@ -99,7 +99,6 @@ XcmsCCC ccc ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -107,14 +106,11 @@ XcmsCCC ccc ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Display *svc_ret_value; diff --git a/xts5/Xlib7/XcmsFormatOfPrefix.m b/xts5/Xlib7/XcmsFormatOfPrefix.m index 81daec3b..aaaab25d 100644 --- a/xts5/Xlib7/XcmsFormatOfPrefix.m +++ b/xts5/Xlib7/XcmsFormatOfPrefix.m @@ -109,7 +109,6 @@ char *prefix_good ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -117,14 +116,11 @@ char *prefix_good ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsColorFormat svc_ret_value; diff --git a/xts5/Xlib7/XcmsFreeCCC.m b/xts5/Xlib7/XcmsFreeCCC.m index bebdccb7..ccca838b 100644 --- a/xts5/Xlib7/XcmsFreeCCC.m +++ b/xts5/Xlib7/XcmsFreeCCC.m @@ -104,7 +104,6 @@ XcmsCCC ccc ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -112,16 +111,11 @@ XcmsCCC ccc ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; - - XcmsCCC svc_ret_value; + cleanup_status; /****** diff --git a/xts5/Xlib7/XcmsLookupColor.m b/xts5/Xlib7/XcmsLookupColor.m index bcec072c..605ecb42 100644 --- a/xts5/Xlib7/XcmsLookupColor.m +++ b/xts5/Xlib7/XcmsLookupColor.m @@ -123,7 +123,6 @@ XcmsColorFormat result_format ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -131,14 +130,11 @@ XcmsColorFormat result_format ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsPrefixOfFormat.m b/xts5/Xlib7/XcmsPrefixOfFormat.m index 8f602fbe..daf912fa 100644 --- a/xts5/Xlib7/XcmsPrefixOfFormat.m +++ b/xts5/Xlib7/XcmsPrefixOfFormat.m @@ -111,7 +111,6 @@ XcmsColorFormat format ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -119,14 +118,11 @@ XcmsColorFormat format ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; char *svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryBlack.m b/xts5/Xlib7/XcmsQueryBlack.m index c3a1aa0b..557340e7 100644 --- a/xts5/Xlib7/XcmsQueryBlack.m +++ b/xts5/Xlib7/XcmsQueryBlack.m @@ -111,7 +111,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -119,14 +118,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryBlue.m b/xts5/Xlib7/XcmsQueryBlue.m index a65cfb98..5dae5bfb 100644 --- a/xts5/Xlib7/XcmsQueryBlue.m +++ b/xts5/Xlib7/XcmsQueryBlue.m @@ -109,7 +109,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -117,14 +116,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryColor.m b/xts5/Xlib7/XcmsQueryColor.m index c4ddd6a0..b64875ce 100644 --- a/xts5/Xlib7/XcmsQueryColor.m +++ b/xts5/Xlib7/XcmsQueryColor.m @@ -123,7 +123,6 @@ XcmsColorFormat format ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -131,14 +130,11 @@ XcmsColorFormat format ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryColors.m b/xts5/Xlib7/XcmsQueryColors.m index cfb02143..fdd53b12 100644 --- a/xts5/Xlib7/XcmsQueryColors.m +++ b/xts5/Xlib7/XcmsQueryColors.m @@ -133,7 +133,6 @@ XcmsColorFormat format ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -141,14 +140,11 @@ XcmsColorFormat format ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryGreen.m b/xts5/Xlib7/XcmsQueryGreen.m index 6bb1a982..870d0793 100644 --- a/xts5/Xlib7/XcmsQueryGreen.m +++ b/xts5/Xlib7/XcmsQueryGreen.m @@ -109,7 +109,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -117,14 +116,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryRed.m b/xts5/Xlib7/XcmsQueryRed.m index 16557100..ce034d71 100644 --- a/xts5/Xlib7/XcmsQueryRed.m +++ b/xts5/Xlib7/XcmsQueryRed.m @@ -104,18 +104,14 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsQueryWhite.m b/xts5/Xlib7/XcmsQueryWhite.m index 471af252..f91c9429 100644 --- a/xts5/Xlib7/XcmsQueryWhite.m +++ b/xts5/Xlib7/XcmsQueryWhite.m @@ -110,21 +110,17 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; /****** * local storage ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsScreenNumberOfCCC.m b/xts5/Xlib7/XcmsScreenNumberOfCCC.m index 1f3c216d..108aa2bd 100644 --- a/xts5/Xlib7/XcmsScreenNumberOfCCC.m +++ b/xts5/Xlib7/XcmsScreenNumberOfCCC.m @@ -108,7 +108,6 @@ XcmsCCC ccc ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -116,14 +115,11 @@ XcmsCCC ccc ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; int svc_ret_value; diff --git a/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m b/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m index acd954a6..2c02c454 100644 --- a/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m +++ b/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m @@ -103,21 +103,17 @@ XcmsCCC ccc ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; /****** * local storage ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsColor *svc_ret_value; diff --git a/xts5/Xlib7/XcmsSetWhiteAdjustProc.m b/xts5/Xlib7/XcmsSetWhiteAdjustProc.m index 70a8b5b2..b62200c7 100644 --- a/xts5/Xlib7/XcmsSetWhiteAdjustProc.m +++ b/xts5/Xlib7/XcmsSetWhiteAdjustProc.m @@ -110,7 +110,6 @@ XPointer client_data ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -118,14 +117,11 @@ XPointer client_data ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; XcmsWhiteAdjustProc svc_ret_value; diff --git a/xts5/Xlib7/XcmsSetWhitePoint.m b/xts5/Xlib7/XcmsSetWhitePoint.m index c8f9fdf6..64a5c6ed 100644 --- a/xts5/Xlib7/XcmsSetWhitePoint.m +++ b/xts5/Xlib7/XcmsSetWhitePoint.m @@ -109,7 +109,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -117,14 +116,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsStoreColor.m b/xts5/Xlib7/XcmsStoreColor.m index 535a6c72..1d08f221 100644 --- a/xts5/Xlib7/XcmsStoreColor.m +++ b/xts5/Xlib7/XcmsStoreColor.m @@ -104,7 +104,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -112,14 +111,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsStoreColors.m b/xts5/Xlib7/XcmsStoreColors.m index 42a50ad3..e2e00be3 100644 --- a/xts5/Xlib7/XcmsStoreColors.m +++ b/xts5/Xlib7/XcmsStoreColors.m @@ -113,7 +113,6 @@ Bool flags_return[] ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -121,14 +120,11 @@ Bool flags_return[] ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxC.m index c7315f7a..63616913 100644 --- a/xts5/Xlib7/XcmsTekHVCQueryMaxC.m +++ b/xts5/Xlib7/XcmsTekHVCQueryMaxC.m @@ -108,7 +108,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -116,14 +115,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxV.m b/xts5/Xlib7/XcmsTekHVCQueryMaxV.m index 3f029fc2..bf17798f 100644 --- a/xts5/Xlib7/XcmsTekHVCQueryMaxV.m +++ b/xts5/Xlib7/XcmsTekHVCQueryMaxV.m @@ -111,7 +111,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -119,14 +118,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m index e93d0f33..de4bb864 100644 --- a/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m +++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m @@ -106,7 +106,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -114,14 +113,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m index 11c3a380..53a24386 100644 --- a/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m +++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m @@ -112,7 +112,6 @@ unsigned int nsamples ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -120,14 +119,11 @@ unsigned int nsamples ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsTekHVCQueryMinV.m b/xts5/Xlib7/XcmsTekHVCQueryMinV.m index bdb7e855..daa198e6 100644 --- a/xts5/Xlib7/XcmsTekHVCQueryMinV.m +++ b/xts5/Xlib7/XcmsTekHVCQueryMinV.m @@ -111,7 +111,6 @@ XcmsColor color ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -119,14 +118,11 @@ XcmsColor color ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Status svc_ret_value; diff --git a/xts5/Xlib7/XcmsVisualOfCCC.m b/xts5/Xlib7/XcmsVisualOfCCC.m index b84692e9..fae56d16 100644 --- a/xts5/Xlib7/XcmsVisualOfCCC.m +++ b/xts5/Xlib7/XcmsVisualOfCCC.m @@ -104,7 +104,6 @@ XcmsCCC ccc ; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); /****** @@ -112,14 +111,11 @@ XcmsCCC ccc ; ******/ char fmtstr[256], *call_string; union msglst fmt_lst[1]; - int skip_pixcheck; int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, - cleanup_status, - i1; + cleanup_status; Visual *svc_ret_value; diff --git a/xts5/Xlib8/XChangeGC.m b/xts5/Xlib8/XChangeGC.m index ddc92eec..80673bb1 100644 --- a/xts5/Xlib8/XChangeGC.m +++ b/xts5/Xlib8/XChangeGC.m @@ -130,8 +130,6 @@ Verify that pixel at (0,0) is W_BG. >>CODE XVisualInfo *vp; Window win; -XRectangle rect; -Pixmap pmap; XGCValues gcv; resetvinf(VI_WIN); @@ -375,8 +373,6 @@ Create a GC with root window as the drawable. Change GC using XChangeGC with bad font as the font component. Verify that a BadFont error occurs. >>CODE BadFont -Window w; -Font font; XGCValues vals; vals.font = badfont(Dsp); @@ -471,8 +467,6 @@ Create a GC with window as the drawable. Change GC using XChangeGC with pixmap as the clip_mask. Verify that a BadPixmap error occurs. >>CODE BadPixmap -Window w; -Pixmap pm; XGCValues vals; vals.clip_mask = badpixm(display); @@ -849,7 +843,6 @@ Change GC using XChangeGC with function component GXcopy GCDashOffset | GCDashList | GCArcMode) Verify that a bad value error occurred. >>CODE BadValue -Window w; XGCValues srcgcv; int i; unsigned char *p; diff --git a/xts5/Xlib8/XCopyGC.m b/xts5/Xlib8/XCopyGC.m index dd9a2687..5ea2a090 100644 --- a/xts5/Xlib8/XCopyGC.m +++ b/xts5/Xlib8/XCopyGC.m @@ -457,7 +457,6 @@ If multiple roots are supported: Copy from the second to the first. Verify that a BadMatch error occurred. >>CODE BadMatch -XVisualInfo vi; char *altroot; int scr_num; diff --git a/xts5/Xlib8/XCreateGC.m b/xts5/Xlib8/XCreateGC.m index 77628e39..2ace3147 100644 --- a/xts5/Xlib8/XCreateGC.m +++ b/xts5/Xlib8/XCreateGC.m @@ -118,9 +118,7 @@ For pixmaps and windows: Verify that the pixel was set. >>CODE XVisualInfo *vp; -Window win; int nvis; -Pixmap pmap; GC gc; for(resetvinf(VI_WIN); nextvinf(&vp);) { @@ -177,9 +175,6 @@ Plot point (0,0) with XDrawPoint. Verify that pixel at (0,0) is W_BG. >>CODE GC gc; -XWindowAttributes atts; -Status s; -Pixmap pm; XGCValues vals; XVisualInfo *vp; @@ -408,8 +403,6 @@ Create a bad pixmap for the root window and free pixmap with XFreePixmap. Create a GC with window as the drawable and pixmap as the clip_mask. Verify that a BadPixmap error occurs. >>CODE BadPixmap -Window w; -Pixmap pm; XGCValues vals; vals.clip_mask = badpixm(display); @@ -774,7 +767,6 @@ Create a GC with valuemask = GCFunction | GCForeground | GCDashOffset | GCDashList | GCArcMode. Verify that a BadValue error occurred. >>CODE BadValue -Window w; XGCValues vals; int i; unsigned char *p; diff --git a/xts5/Xlib8/XFlushGC.m b/xts5/Xlib8/XFlushGC.m index 75aacd0e..efba0ed7 100644 --- a/xts5/Xlib8/XFlushGC.m +++ b/xts5/Xlib8/XFlushGC.m @@ -63,7 +63,6 @@ void XFlushGC() >>EXTERN -XGCValues good_defaults; Pixmap pixmap1, tilemap, stipmap; @@ -89,17 +88,12 @@ GC gc_id; extern int chkflg; extern int signal_status(); extern int unexp_err(); - extern char *svc_user_arg; extern char *strcpy(); - char fmtstr[256], *call_string; - union msglst fmt_lst[1]; - int skip_pixcheck; - int ss_status, /* save stat return status */ stat_status, /* check stat return status */ - setup_status, cleanup_status, i1; + setup_status, cleanup_status; regr_args.l_flags.bufrout = 1; @@ -146,7 +140,6 @@ GC gc_id; (errflg == 0) && (stat_status == REGR_NORMAL)) { - GC good_defaults; unsigned long value_mask; XGCValues values; diff --git a/xts5/Xlib8/XSetArcMode.m b/xts5/Xlib8/XSetArcMode.m index 6244280b..b9923219 100644 --- a/xts5/Xlib8/XSetArcMode.m +++ b/xts5/Xlib8/XSetArcMode.m @@ -122,7 +122,6 @@ Verify (arc origin-1, arc origin-1) is set to fg. XVisualInfo *vp; Window win; XGCValues values; -struct area ar; resetvinf(VI_WIN); nextvinf(&vp); diff --git a/xts5/Xlib8/XSetClipRectangles.m b/xts5/Xlib8/XSetClipRectangles.m index e5fb2943..f91edd90 100644 --- a/xts5/Xlib8/XSetClipRectangles.m +++ b/xts5/Xlib8/XSetClipRectangles.m @@ -118,7 +118,6 @@ XVisualInfo *vp; Window win; XGCValues values; XRectangle drects[2]; -int i, j; int pass = 0, fail = 0; resetvinf(VI_WIN); @@ -179,7 +178,6 @@ XVisualInfo *vp; Window win; XGCValues values; XRectangle drects[3]; -int i, j; int pass = 0, fail = 0; resetvinf(VI_WIN); @@ -238,7 +236,6 @@ XVisualInfo *vp; Window win; XGCValues values; XRectangle drects[3]; -int i, j; int pass = 0, fail = 0; resetvinf(VI_WIN); @@ -377,7 +374,6 @@ For all supported visuals: XVisualInfo *vp; Window win; XGCValues values; -GC pgc; int i, j; values.foreground = W_FG; diff --git a/xts5/Xlib8/XSetFillRule.m b/xts5/Xlib8/XSetFillRule.m index 1e902c95..10a35096 100644 --- a/xts5/Xlib8/XSetFillRule.m +++ b/xts5/Xlib8/XSetFillRule.m @@ -124,8 +124,6 @@ XPoint poly[] = { {0,0} , {0,1}, {1,1}, {1,0}, {0,0}, {0,1}, {1,1}, {1,0} }; XVisualInfo *vp; Window win; XGCValues values; -Pixmap stip; -GC sgc; resetvinf(VI_WIN); nextvinf(&vp); diff --git a/xts5/Xlib8/XSetFont.m b/xts5/Xlib8/XSetFont.m index 0f9af148..4e659bf7 100644 --- a/xts5/Xlib8/XSetFont.m +++ b/xts5/Xlib8/XSetFont.m @@ -125,10 +125,9 @@ Draw string with glyph differing between font 1 and 2. Verify that not all pixels in the window are set to bg. >>CODE XVisualInfo *vp; -XFontStruct *fs1, *fs2, *rfs; -XCharStruct *cs1,*cs2,*maxchar; +XFontStruct *fs1, *fs2; +XCharStruct *cs1, *cs2; XGCValues values; -GContext gcctxt; int xmin, ymax; resetvinf(VI_WIN); diff --git a/xts5/Xlib8/XSetGraphicsExposures.m b/xts5/Xlib8/XSetGraphicsExposures.m index ce53523d..3394d7df 100644 --- a/xts5/Xlib8/XSetGraphicsExposures.m +++ b/xts5/Xlib8/XSetGraphicsExposures.m @@ -125,7 +125,6 @@ XEvent event; XVisualInfo *vp; Window win; XGCValues values; -struct area ar; resetvinf(VI_WIN); nextvinf(&vp); diff --git a/xts5/Xlib9/XClearArea.m b/xts5/Xlib9/XClearArea.m index 56bf325b..1b4772a3 100644 --- a/xts5/Xlib9/XClearArea.m +++ b/xts5/Xlib9/XClearArea.m @@ -300,7 +300,6 @@ Set background pixmap to None. Call XClearArea. Check that the window is not changed. >>CODE -struct area area; XVisualInfo *vp; for (resetvinf(VI_WIN); nextvinf(&vp); ) { diff --git a/xts5/Xlib9/XClearWindow.m b/xts5/Xlib9/XClearWindow.m index 885a3d43..7e7b4760 100644 --- a/xts5/Xlib9/XClearWindow.m +++ b/xts5/Xlib9/XClearWindow.m @@ -222,7 +222,6 @@ Set background pixmap to None. Call XClearWindow. Check that the whole window is left alone. >>CODE -struct area area; XVisualInfo *vp; for (resetvinf(VI_WIN); nextvinf(&vp); ) { diff --git a/xts5/Xlib9/XCopyArea/XCopyArea.m b/xts5/Xlib9/XCopyArea/XCopyArea.m index fe10c8cd..2920ddda 100644 --- a/xts5/Xlib9/XCopyArea/XCopyArea.m +++ b/xts5/Xlib9/XCopyArea/XCopyArea.m @@ -188,7 +188,6 @@ For all pixmaps >>CODE Window w1, w2; XVisualInfo *vp; -Pixmap pm; struct area area; for (resetvinf(VI_PIX); nextvinf(&vp); ) { diff --git a/xts5/Xlib9/XCopyPlane/XCopyPlane.m b/xts5/Xlib9/XCopyPlane/XCopyPlane.m index dec7ffb4..bad148bf 100644 --- a/xts5/Xlib9/XCopyPlane/XCopyPlane.m +++ b/xts5/Xlib9/XCopyPlane/XCopyPlane.m @@ -285,7 +285,6 @@ verify that it is not copied. >>CODE Window w1, w2; XVisualInfo *vp; -Pixmap pm; struct area area; /* diff --git a/xts5/Xlib9/XDrawArc/XDrawArc.m b/xts5/Xlib9/XDrawArc/XDrawArc.m index f5c0d0cb..a9274f37 100644 --- a/xts5/Xlib9/XDrawArc/XDrawArc.m +++ b/xts5/Xlib9/XDrawArc/XDrawArc.m @@ -122,7 +122,7 @@ int ax1, ay1, ax2, ay2; { int negw = 0; int negh = 0; -int pass = 0, fail = 0; +int fail = 0; x = ax1; y = ay1; diff --git a/xts5/Xlib9/XDrawArcs/XDrawArcs.m b/xts5/Xlib9/XDrawArcs/XDrawArcs.m index 36245c34..5f5eed34 100644 --- a/xts5/Xlib9/XDrawArcs/XDrawArcs.m +++ b/xts5/Xlib9/XDrawArcs/XDrawArcs.m @@ -129,7 +129,7 @@ int ax1, ay1, ax2, ay2; XArc arc; int negw = 0; int negh = 0; -int pass = 0, fail = 0; +int fail = 0; arc.x = ax1; arc.y = ay1; diff --git a/xts5/Xlib9/XDrawLine/XDrawLine.m b/xts5/Xlib9/XDrawLine/XDrawLine.m index 4272f539..2ed09f39 100644 --- a/xts5/Xlib9/XDrawLine/XDrawLine.m +++ b/xts5/Xlib9/XDrawLine/XDrawLine.m @@ -118,7 +118,7 @@ static void drawline(ax1, ay1, ax2, ay2) int ax1, ay1, ax2, ay2; { -int pass = 0, fail = 0; +int fail = 0; x1 = ax1; y1 = ay1; x2 = ax2; y2 = ay2; diff --git a/xts5/Xlib9/XDrawLines/XDrawLines.m b/xts5/Xlib9/XDrawLines/XDrawLines.m index 5d0552e5..4ae31772 100644 --- a/xts5/Xlib9/XDrawLines/XDrawLines.m +++ b/xts5/Xlib9/XDrawLines/XDrawLines.m @@ -133,7 +133,7 @@ drawline(x1, y1, x2, y2) int x1, y1, x2, y2; { XPoint pnts[2]; -int pass = 0, fail = 0; +int fail = 0; pnts[0].x = x1; pnts[0].y = y1; diff --git a/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m b/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m index f7b39617..4d4f3ae5 100644 --- a/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m +++ b/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m @@ -122,7 +122,7 @@ static void drawline(ax1, ay1, ax2, ay2) int ax1, ay1, ax2, ay2; { -int pass = 0, fail = 0; +int fail = 0; int x2 = MAX(ax1,ax2), y2 = MAX(ay1,ay2); /* * Draw a rectangle that has the two given points as vertices. diff --git a/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m b/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m index 9906a578..269a349f 100644 --- a/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m +++ b/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m @@ -131,7 +131,7 @@ drawline(ax1, ay1, ax2, ay2) int ax1, ay1, ax2, ay2; { XRectangle rect; -int pass = 0, fail = 0; +int fail = 0; int x2 = MAX(ax1,ax2), y2 = MAX(ay1,ay2); /* * Draw a rectangle that has the two given points as vertices. diff --git a/xts5/Xlib9/XDrawSegments/XDrawSegments.m b/xts5/Xlib9/XDrawSegments/XDrawSegments.m index 2c9ecbee..48ab4439 100644 --- a/xts5/Xlib9/XDrawSegments/XDrawSegments.m +++ b/xts5/Xlib9/XDrawSegments/XDrawSegments.m @@ -123,7 +123,7 @@ drawline(ax1, ay1, ax2, ay2) int ax1, ay1, ax2, ay2; { XSegment segs[1]; -int pass = 0, fail = 0; +int fail = 0; segs[0].x1 = ax1; segs[0].y1 = ay1; segs[0].x2 = ax2; segs[0].y2 = ay2; diff --git a/xts5/Xlib9/XGetFontProperty.m b/xts5/Xlib9/XGetFontProperty.m index 60e07083..b5d3f59c 100644 --- a/xts5/Xlib9/XGetFontProperty.m +++ b/xts5/Xlib9/XGetFontProperty.m @@ -214,7 +214,6 @@ Verify that False is returned. >>CODE unsigned long val; Bool ret; -int i; extern XFontStruct xtfont0; /* Known good version */ font_struct = XLoadQueryFont(Dsp, "xtfont0"); diff --git a/xts5/Xlib9/XGetImage.m b/xts5/Xlib9/XGetImage.m index be6e981b..5a382ca8 100644 --- a/xts5/Xlib9/XGetImage.m +++ b/xts5/Xlib9/XGetImage.m @@ -592,8 +592,6 @@ Window w; XImage *im1, *im2; static struct area area1 = { -1, -1, 1, 1 }; -static struct area area2 = - { W_STDWIDTH, W_STDHEIGHT, 1, 1 }; for (resetvinf(VI_WIN); nextvinf(&vp); ) { im1 = im2 = (XImage *) 0; @@ -1018,15 +1016,11 @@ Verify that BadMatch error occurred. >>CODE BadMatch XVisualInfo *vp; Window w; -Window w2; -int wx, wy; /* coordinates of window */ static struct area area1 = { 0, 0, W_STDWIDTH, W_STDHEIGHT }; static struct area area2 = { 0, 0, W_STDWIDTH, W_STDHEIGHT }; XImage *image; -unsigned int tmpui; /* uninteresting XGetGeometry return values */ -Window tmpw; /* uninteresting XGetGeometry return values */ resetvinf(VI_WIN); nextvinf(&vp); /* use first one we come to */ diff --git a/xts5/Xlib9/XGetSubImage.m b/xts5/Xlib9/XGetSubImage.m index e3b90c00..d50c392e 100644 --- a/xts5/Xlib9/XGetSubImage.m +++ b/xts5/Xlib9/XGetSubImage.m @@ -774,8 +774,6 @@ XImage *image; XImage *zimage; static struct area area1 = { -1, -1, 1, 1 }; -static struct area area2 = - { W_STDWIDTH, W_STDHEIGHT, 1, 1 }; static struct area aread = { 1, 1, 0, 0 }; @@ -1212,15 +1210,11 @@ Verify that BadMatch error occurred. >>CODE BadMatch XVisualInfo *vp; Window w; -Window w2; -int wx, wy; /* coordinates of window */ static struct area area1 = { 0, 0, W_STDWIDTH, W_STDHEIGHT }; static struct area area2 = { 0, 0, W_STDWIDTH, W_STDHEIGHT }; XImage *image; -unsigned int tmpui; /* uninteresting XGetGeometry return values */ -Window tmpw; resetvinf(VI_WIN); nextvinf(&vp); /* use first visual */ diff --git a/xts5/Xlib9/XQueryFont.m b/xts5/Xlib9/XQueryFont.m index 1ac1b385..d4598b95 100644 --- a/xts5/Xlib9/XQueryFont.m +++ b/xts5/Xlib9/XQueryFont.m @@ -205,7 +205,6 @@ Obtain a bad font ID. Call XQueryFont. Verify that null is returned. >>CODE -Font font; XFontStruct *fsp; font_ID = badfont(Dsp); diff --git a/xts5/Xlib9/XQueryTextExtents16.m b/xts5/Xlib9/XQueryTextExtents16.m index cc061f58..e41bef4f 100644 --- a/xts5/Xlib9/XQueryTextExtents16.m +++ b/xts5/Xlib9/XQueryTextExtents16.m @@ -156,7 +156,6 @@ For each VSW5 font extern struct fontinfo fontinfo[]; extern int nfontinfo; int i; -char buf[256]; int good_direction; int good_font_ascent; int good_font_descent; @@ -258,7 +257,6 @@ For each VSW5 font extern struct fontinfo fontinfo[]; extern int nfontinfo; int i; -char buf[256]; int good_direction; int good_font_ascent; int good_font_descent; diff --git a/xts5/Xlib9/XTextExtents16.m b/xts5/Xlib9/XTextExtents16.m index 3c6a13ef..2580e68f 100644 --- a/xts5/Xlib9/XTextExtents16.m +++ b/xts5/Xlib9/XTextExtents16.m @@ -136,7 +136,6 @@ For each 16 bit VSW5 font extern struct fontinfo fontinfo[]; extern int nfontinfo; int i; -char buf[256]; int direction; int font_ascent; int font_descent; diff --git a/xts5/Xopen/XStringToKeysym/Test1.c b/xts5/Xopen/XStringToKeysym/Test1.c index d0a84d23..5c5a4c6a 100644 --- a/xts5/Xopen/XStringToKeysym/Test1.c +++ b/xts5/Xopen/XStringToKeysym/Test1.c @@ -122,11 +122,8 @@ char *s; #undef XK_LATIN1 strtsym1() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_space if(test(XK_space, "space") == 1) diff --git a/xts5/Xopen/XStringToKeysym/Test2.c b/xts5/Xopen/XStringToKeysym/Test2.c index 6a35f75e..f1bfb706 100644 --- a/xts5/Xopen/XStringToKeysym/Test2.c +++ b/xts5/Xopen/XStringToKeysym/Test2.c @@ -122,11 +122,8 @@ char *s; #undef XK_LATIN2 strtsym2() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_Aogonek if(test(XK_Aogonek, "Aogonek") == 1) diff --git a/xts5/Xopen/XStringToKeysym/Test3.c b/xts5/Xopen/XStringToKeysym/Test3.c index f77eee74..ac3e33c1 100644 --- a/xts5/Xopen/XStringToKeysym/Test3.c +++ b/xts5/Xopen/XStringToKeysym/Test3.c @@ -122,11 +122,8 @@ char *s; #undef XK_LATIN3 strtsym3() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_Hstroke if(test(XK_Hstroke, "Hstroke") == 1) diff --git a/xts5/Xopen/XStringToKeysym/Test4.c b/xts5/Xopen/XStringToKeysym/Test4.c index 5f3dc826..a434da0c 100644 --- a/xts5/Xopen/XStringToKeysym/Test4.c +++ b/xts5/Xopen/XStringToKeysym/Test4.c @@ -122,11 +122,8 @@ char *s; #undef XK_LATIN4 strtsym4() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_kra if(test(XK_kra, "kra") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestA.c b/xts5/Xopen/XStringToKeysym/TestA.c index c2919b54..f029f2b9 100644 --- a/xts5/Xopen/XStringToKeysym/TestA.c +++ b/xts5/Xopen/XStringToKeysym/TestA.c @@ -122,11 +122,8 @@ char *s; #undef XK_ARABIC strtsymA() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_Arabic_comma if(test(XK_Arabic_comma, "Arabic_comma") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestC.c b/xts5/Xopen/XStringToKeysym/TestC.c index 8652bcd7..21ccf2bb 100644 --- a/xts5/Xopen/XStringToKeysym/TestC.c +++ b/xts5/Xopen/XStringToKeysym/TestC.c @@ -122,11 +122,8 @@ char *s; #undef XK_CYRILLIC strtsymC() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_Serbian_dje if(test(XK_Serbian_dje, "Serbian_dje") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestG.c b/xts5/Xopen/XStringToKeysym/TestG.c index 18cb6930..420b4083 100644 --- a/xts5/Xopen/XStringToKeysym/TestG.c +++ b/xts5/Xopen/XStringToKeysym/TestG.c @@ -122,11 +122,8 @@ char *s; #undef XK_GREEK strtsymG() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_Greek_ALPHAaccent if(test(XK_Greek_ALPHAaccent, "Greek_ALPHAaccent") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestH.c b/xts5/Xopen/XStringToKeysym/TestH.c index 67a72920..95e5440b 100644 --- a/xts5/Xopen/XStringToKeysym/TestH.c +++ b/xts5/Xopen/XStringToKeysym/TestH.c @@ -122,11 +122,8 @@ char *s; #undef XK_HEBREW strtsymH() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_hebrew_doublelowline if(test(XK_hebrew_doublelowline, "hebrew_doublelowline") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestK.c b/xts5/Xopen/XStringToKeysym/TestK.c index f4221711..2aa6a28c 100644 --- a/xts5/Xopen/XStringToKeysym/TestK.c +++ b/xts5/Xopen/XStringToKeysym/TestK.c @@ -122,11 +122,8 @@ char *s; #undef XK_KATAKANA strtsymK() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_overline if(test(XK_overline, "overline") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestL.c b/xts5/Xopen/XStringToKeysym/TestL.c index 7d8494a4..ba401b02 100644 --- a/xts5/Xopen/XStringToKeysym/TestL.c +++ b/xts5/Xopen/XStringToKeysym/TestL.c @@ -122,11 +122,8 @@ char *s; #undef XK_APL strtsymL() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_leftcaret if(test(XK_leftcaret, "leftcaret") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestM.c b/xts5/Xopen/XStringToKeysym/TestM.c index 37e89440..cfb6ea94 100644 --- a/xts5/Xopen/XStringToKeysym/TestM.c +++ b/xts5/Xopen/XStringToKeysym/TestM.c @@ -122,11 +122,8 @@ char *s; #undef XK_MISCELLANY strtsymM() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_BackSpace if(test(XK_BackSpace, "BackSpace") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestP.c b/xts5/Xopen/XStringToKeysym/TestP.c index 41bcef45..827030e5 100644 --- a/xts5/Xopen/XStringToKeysym/TestP.c +++ b/xts5/Xopen/XStringToKeysym/TestP.c @@ -122,11 +122,8 @@ char *s; #undef XK_PUBLISHING strtsymP() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_emspace if(test(XK_emspace, "emspace") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestS.c b/xts5/Xopen/XStringToKeysym/TestS.c index 7aba26ae..952ddd13 100644 --- a/xts5/Xopen/XStringToKeysym/TestS.c +++ b/xts5/Xopen/XStringToKeysym/TestS.c @@ -122,11 +122,8 @@ char *s; #undef XK_SPECIAL strtsymS() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_blank if(test(XK_blank, "blank") == 1) diff --git a/xts5/Xopen/XStringToKeysym/TestT.c b/xts5/Xopen/XStringToKeysym/TestT.c index 73bc7ba9..3739db3d 100644 --- a/xts5/Xopen/XStringToKeysym/TestT.c +++ b/xts5/Xopen/XStringToKeysym/TestT.c @@ -122,11 +122,8 @@ char *s; #undef XK_TECHNICAL strtsymT() -{ -int pass = 0, fail = 0; -char *symstr; -KeySym rsym; - +{ + int pass = 0, fail = 0; #ifdef XK_leftradical if(test(XK_leftradical, "leftradical") == 1) diff --git a/xts5/Xproto/pGetImage.m b/xts5/Xproto/pGetImage.m index fc45234f..ef5f5731 100644 --- a/xts5/Xproto/pGetImage.m +++ b/xts5/Xproto/pGetImage.m @@ -130,10 +130,6 @@ static void tester() { - unsigned char *from; - unsigned char *to; - unsigned int len; - Create_Client(CLIENT); win = Create_Default_Window(CLIENT); diff --git a/xts5/src/bin/mc/code.c b/xts5/src/bin/mc/code.c index aefcc864..7d4037d6 100644 --- a/xts5/src/bin/mc/code.c +++ b/xts5/src/bin/mc/code.c @@ -211,8 +211,7 @@ void mcend(buf) char *buf; { -int i; -FILE *fout; + int i; /* Finish the copyright banner */ (void) fprintf(FpBanner, "*/\n"); diff --git a/xts5/src/bin/mc/ma.c b/xts5/src/bin/mc/ma.c index fce93643..b3448bc0 100644 --- a/xts5/src/bin/mc/ma.c +++ b/xts5/src/bin/mc/ma.c @@ -158,16 +158,6 @@ maassertion(fp, buf) FILE *fp; char *buf; { -static char *reasons[] = { - "Temporarily can't be implemented", - "There is no known portable test method for this assertion", - "The statement in the X11 specification is not specific enough to write a test", - "There is no known reliable test method for this assertion", - "Testing the assertion would require setup procedures that involve an unreasonable amount of effort by the user of the test suite.", - "Testing the assertion would require an unreasonable amount of time or resources on most systems", - "Creating a test would require an unreasonable amount of test development time.", -}; - (void) fprintf(FpText, ".TI "); if (State.category != CAT_NONE) (void) fprintf(FpText, "%c ", (char)State.category); diff --git a/xts5/src/bin/reports/xts-report.c b/xts5/src/bin/reports/xts-report.c index 49a831e1..8e4b1e42 100644 --- a/xts5/src/bin/reports/xts-report.c +++ b/xts5/src/bin/reports/xts-report.c @@ -298,11 +298,9 @@ char *tet_root; static void whatj(void) { - int jfileno = 0; DIR *dirp; struct dirent *dp; struct stat sbuf; - char jbuf[5]; char ttmp[5]; struct tm mytm; time_t mytime; @@ -1508,8 +1506,7 @@ static void print_ecount(int errcnt, char *errstring) static void print_summary(void) { - int i,j, k; - struct passwd *pwdp; + int i; char ttmp[5]; struct tm mytm; time_t mytime; diff --git a/xts5/src/lib/XInput.c b/xts5/src/lib/XInput.c index 62e93bf3..04169b79 100644 --- a/xts5/src/lib/XInput.c +++ b/xts5/src/lib/XInput.c @@ -131,7 +131,6 @@ Setup_Extension_DeviceInfo(dmask) XDevice *dev; Bool nokeys, nobuttons, novaluators; unsigned int mask=0; - extern Display *Dsp; XDeviceInfoPtr list; XAnyClassPtr any; XInputClassInfo *ip; diff --git a/xts5/src/lib/ex_startup.c b/xts5/src/lib/ex_startup.c index 44e15d7b..58358c6c 100644 --- a/xts5/src/lib/ex_startup.c +++ b/xts5/src/lib/ex_startup.c @@ -151,7 +151,6 @@ exec_startup() { char *disp; char *cp; -extern char *TestName; #ifdef __STDC__ extern int unexp_err(Display *, XErrorEvent *ep); extern int io_err(Display *); @@ -166,8 +165,6 @@ extern int io_err(); * Set the debug level first. */ if ((cp = tet_getvar("XT_DEBUG")) != NULL) { - extern int DebugLevel; - setdblev(atov(cp)); } else { setdblev(0); diff --git a/xts5/src/lib/startup.c b/xts5/src/lib/startup.c index 8370eb3e..54744c5d 100644 --- a/xts5/src/lib/startup.c +++ b/xts5/src/lib/startup.c @@ -182,7 +182,7 @@ startup() int i; char *disp; char *cp; -extern char *TestName; +/* APTETS extern char *TestName; */ extern struct tet_testlist tet_testlist[]; #ifdef __STDC__ extern int unexp_err(Display *d, XErrorEvent *ev); @@ -196,8 +196,6 @@ extern int io_err(); * Set the debug level first (it is used in initconfig). */ if ((cp = tet_getvar("XT_DEBUG")) != NULL) { - extern int DebugLevel; - setdblev(atov(cp)); } else { setdblev(0); diff --git a/xts5/src/libXR5/blowup.c b/xts5/src/libXR5/blowup.c index 62595e80..63018b77 100644 --- a/xts5/src/libXR5/blowup.c +++ b/xts5/src/libXR5/blowup.c @@ -524,11 +524,9 @@ int compare_color; show_color = (!show_color); else if ((kgi) &&(xev.xbutton.window == key[4])) /* move to next error */ { - XEvent fake; int x_scan,y_scan; XImage *ximage; unsigned long test_pixel, good_pixel; - unsigned char test_monopix, good_monopix; int begin_x; short found_mismatch; int old_x_scan,old_y_scan; diff --git a/xts5/src/libXR5/dumpbuf.c b/xts5/src/libXR5/dumpbuf.c index 8b1ad67e..67d9f9a1 100644 --- a/xts5/src/libXR5/dumpbuf.c +++ b/xts5/src/libXR5/dumpbuf.c @@ -128,8 +128,6 @@ extern char ebuf[]; void dumpbuf(void) { - static char dbuf[4096]; - FILE *fp, *fopen(); char tempbuf[256], *tempptr; if (errflg && (errcnt <= errlmt)) diff --git a/xts5/src/libXR5/misc.c b/xts5/src/libXR5/misc.c index 9566dfdd..82d3608f 100644 --- a/xts5/src/libXR5/misc.c +++ b/xts5/src/libXR5/misc.c @@ -210,7 +210,6 @@ Colormap cmap; extern void blowup(); extern int blowup_size,region_mode,PixPerCM; extern struct args regr_args; - extern Display *dpy_save; extern XWindowAttributes wat_save; Window b_win, n_win, key_win, highlight; diff --git a/xts5/src/libXR5/r5startup.c b/xts5/src/libXR5/r5startup.c index 301fa6ca..49ba7676 100644 --- a/xts5/src/libXR5/r5startup.c +++ b/xts5/src/libXR5/r5startup.c @@ -164,7 +164,7 @@ r5_startup() int i; char *disp; char *cp; -extern char *TestName; +/* extern char *TestName; */ extern struct tet_testlist tet_testlist[]; extern int unexp_err(); extern int io_err(); @@ -174,8 +174,6 @@ extern int io_err(); */ if ((cp = tet_getvar("XT_DEBUG")) != NULL) { - extern int DebugLevel; - setdblev(atov(cp)); } else { setdblev(0); diff --git a/xts5/src/libXR5/save.c b/xts5/src/libXR5/save.c index 0f975666..90a39fbf 100644 --- a/xts5/src/libXR5/save.c +++ b/xts5/src/libXR5/save.c @@ -138,7 +138,6 @@ Display *display_struc; Drawable drawable_id; { extern int unexp_err(); - extern Display *dpy_save; extern Window wid_save; extern Pixmap pid_save; extern GC gc_save; @@ -156,8 +155,6 @@ Drawable drawable_id; GCGraphicsExposures | GCClipXOrigin | GCClipYOrigin | GCClipMask | GCDashOffset | GCDashList | GCArcMode, gc_save); -/* if ((dpy_msk & save_mask) != 0) * disable display structure checking for now * - dpy_save = display_struc; */ if ((win_msk & save_mask) != 0) { /* window attributes for default window*/ XGetWindowAttributes (display_struc, drawable_id, &wat_save); wid_save = drawable_id; diff --git a/xts5/src/libproto/Expect.c b/xts5/src/libproto/Expect.c index 52905f3c..dff5bc02 100644 --- a/xts5/src/libproto/Expect.c +++ b/xts5/src/libproto/Expect.c @@ -591,7 +591,6 @@ int client; { XstDisplay * dpy = Get_Display (client); xReq * req; - int type; TestType tt = Get_Test_Type(client); switch (tt) { diff --git a/xts5/src/libproto/RcvExtRep.c b/xts5/src/libproto/RcvExtRep.c index 93010d84..74c1e171 100644 --- a/xts5/src/libproto/RcvExtRep.c +++ b/xts5/src/libproto/RcvExtRep.c @@ -156,28 +156,18 @@ xReply *rp; /* pointer to XLIB-format reply structure */ char rbuf[]; /* receive buffer for reply data */ int type; /* */ int client; /* */ -{ /* - needswap - rbp pointer to first byte of receive buffer after header - valuePtr pointer to first byte of rp after fixed-size part - of reply - i - nlen - valid - nitems - calculated_length - */ +{ #ifdef INPUTEXTENSION int needswap = Xst_clients[client].cl_swap; char *nptr; + /* pointer to first byte of receive buffer after header */ char *rbp = (char *) ((char *)rbuf + REPLY_HEADER); + /* pointer to first byte of rp after fixed-size part of reply */ unsigned char *valuePtr = (unsigned char *) ((unsigned char *)rp + sizeof(xReply)); int i, j; - int nlen; int valid = 1; /* assume all is OK */ - int nitems; int calculated_length = 0; int extension; unsigned long bytes_there = (long)(rp->generic.length<<2) + sizeof(xReply); @@ -197,7 +187,6 @@ int client; /* */ { /* rp->generic.data1 is the number of extension strings in the returned list of strings. */ - int value_len = 0; /* total bytes in returned value */ xDeviceInfo *list =(xDeviceInfoPtr)(rbuf + sizeof (xReply)); xAnyClassPtr any; int ndevices; diff --git a/xts5/src/libproto/RcvRep.c b/xts5/src/libproto/RcvRep.c index 29a4aee9..fca22653 100644 --- a/xts5/src/libproto/RcvRep.c +++ b/xts5/src/libproto/RcvRep.c @@ -522,9 +522,6 @@ int client; /* */ (Xst_clients[client].cl_dpy) -> byte_order; long flip = my_sex ^ server_sex; /* assume MSBFirst == 1 */ int server_pad = (Xst_clients[client].cl_dpy) -> bitmap_pad; - int server_unit = (Xst_clients[client].cl_dpy) -> bitmap_unit; - int server_bitorder = - (Xst_clients[client].cl_dpy) -> bitmap_bit_order; int dst_width /*in bytes*/ = (Xst_clients[client].cl_imagewidth + 7) >> 3; int src_width /*in bytes*/ = dst_width + @@ -542,12 +539,6 @@ int client; /* */ Length_Error(max(bytes_there,calculated_length<<2),client,rp,type,"GetImage",calculated_length); break; } -/***** - if (server_bitorder != MSBFirst) { - Log_Err("LSBFirst bit ordering not supported in Rcv_Rep()\n"); - Finish(client); - } -*****/ rp->generic.length = (dst_width * Xst_clients[client].cl_imageheight) >> 2; diff --git a/xts5/src/libproto/SendReq.c b/xts5/src/libproto/SendReq.c index a883695c..03205945 100644 --- a/xts5/src/libproto/SendReq.c +++ b/xts5/src/libproto/SendReq.c @@ -891,9 +891,6 @@ int pollreq; (Xst_clients[client].cl_dpy) -> byte_order; long flip = my_sex ^ server_sex; /* assume MSBFirst == 1 */ int server_pad = (Xst_clients[client].cl_dpy) -> bitmap_pad; - int server_unit = (Xst_clients[client].cl_dpy) -> bitmap_unit; - int server_bitorder = - (Xst_clients[client].cl_dpy) -> bitmap_bit_order; int src_width /*in bytes*/ = (int)(((xPutImageReq *)rp)->width + 7) >> 3; int dst_width /*in bytes*/ = src_width + @@ -903,12 +900,6 @@ int pollreq; char **dst = (&(Get_Display(client)->bufptr)); char *drop; -/***** - if (server_bitorder != MSBFirst) { - Log_Err("LSBFirst bit ordering not supported in Send_Req()\n"); - Abort(); - } -*****/ if (((xPutImageReq *)rp)->leftPad != 0) { Log_Err("leftPad != 0; not supported in Send_Req()\n"); Abort(); diff --git a/xts5/src/libproto/SendXIReq.c b/xts5/src/libproto/SendXIReq.c index a875d687..80aa3ac6 100644 --- a/xts5/src/libproto/SendXIReq.c +++ b/xts5/src/libproto/SendXIReq.c @@ -172,7 +172,6 @@ int pollreq; { XstDisplay *dpy = Get_Display(client); unsigned long bytesToSend = rp->length << 2; - unsigned long n; unsigned long newlen; unsigned long bigRequestLength = 0; unsigned long bigRequestsAreEnabled = 0; @@ -522,7 +521,6 @@ int pollreq; case X_ChangeFeedbackControl: { XID class; - extern char *FeedbackData; send1(client,(long) ((xChangeFeedbackControlReq *)rp)->reqType); send1(client,(long) ((xChangeFeedbackControlReq *)rp)->ReqType); send2(client,(short) ((xChangeFeedbackControlReq *)rp)->length); @@ -536,9 +534,6 @@ int pollreq; send1(client,(long) ((xChangeFeedbackControlReq *)rp)->pad2); class = *((char *)((xChangeFeedbackControlReq *)rp+1)); Send_Feedback_Control (client, class, (xChangeFeedbackControlReq *)rp+1); - /* - Send_Feedback_Control (client, class, FeedbackData); - */ } break; case X_GetDeviceKeyMapping: diff --git a/xts5/src/libproto/ShowRep.c b/xts5/src/libproto/ShowRep.c index 79e8377c..b3a8059d 100644 --- a/xts5/src/libproto/ShowRep.c +++ b/xts5/src/libproto/ShowRep.c @@ -559,7 +559,6 @@ long bytes_given; { unsigned short nhosts; xHostEntry *hp; - char scratch[132]; unsigned long hostname; int i; diff --git a/xts5/src/libproto/ValListMng.c b/xts5/src/libproto/ValListMng.c index 4472459d..d4b7e2f0 100644 --- a/xts5/src/libproto/ValListMng.c +++ b/xts5/src/libproto/ValListMng.c @@ -319,7 +319,6 @@ unsigned long mask; unsigned long value; { unsigned long rmask; - unsigned long new_size; CARD32 *valuePtr; int before; /* number of values before this one */ int after; /* number of values after this one */ @@ -451,7 +450,6 @@ CARD16 *rmaskp16; unsigned long mask; { unsigned long rmask; - unsigned long new_size; CARD32 *valuePtr; int before; /* number of values before this one */ int after; /* number of values after this one */ @@ -1149,7 +1147,6 @@ Add_Counted_Bytes (reqp, bytep, nbytes) { unsigned long nominal_size; unsigned char *valuePtr; - unsigned long valueLen; switch (reqp -> reqType) { case X_ChangeHosts: diff --git a/xts5/src/libproto/startup.c b/xts5/src/libproto/startup.c index e3722d79..0718d5cb 100644 --- a/xts5/src/libproto/startup.c +++ b/xts5/src/libproto/startup.c @@ -162,7 +162,7 @@ protostartup() int i; char *disp; char *cp; -extern char *TestName; +/* extern char *TestName; */ extern struct tet_testlist tet_testlist[]; /* error handlers from libxtest */ @@ -172,8 +172,6 @@ extern int io_err(), unexp_err(); * Set the debug level first (it is used in initconfig). */ if ((cp = tet_getvar("XT_DEBUG")) != NULL) { - extern int DebugLevel; - setdblev(atoi(cp)); } else { setdblev(0); diff --git a/xts5/src/xim/response.c b/xts5/src/xim/response.c index 0d5d5b9d..b00ccdd7 100644 --- a/xts5/src/xim/response.c +++ b/xts5/src/xim/response.c @@ -254,7 +254,7 @@ Bool xim_response_open(plocale,style) char str[MAXLINELEN]; int key; Bool got_responses; - int pe_style,status_style,tstyle; + int pe_style, status_style; char *pstr; char id[MAXIDLEN]; @@ -562,7 +562,6 @@ static wchar_t *read_wcstr(cnt) { int n,num; Bool data_end,in_data; - unsigned long *pf; char *tstr; wchar_t *pwc,*pn; @@ -724,7 +723,7 @@ static XIMText *read_ximtext() { Bool data_end,in_data; XIMText *pt; - int key,num,n; + int key, num; char *tstr; char id[MAXIDLEN]; @@ -1082,9 +1081,7 @@ static Pixmap read_pixmap() { Bool data_end,in_data; XIMText *pt; - int key,num; char *tstr; - char id[MAXIDLEN]; /* allocate some space */ pt = (XIMText *)malloc(sizeof(XIMText)); @@ -1254,7 +1251,6 @@ Bool xim_response_read() Bool response_end; Bool got_response_key; Bool in_response; - char str[MAXLINELEN]; char *pdata,*tstr; char id[MAXIDLEN]; int key; diff --git a/xts5/src/xim/stimulus.c b/xts5/src/xim/stimulus.c index 9c0ee2a0..5a0b573a 100644 --- a/xts5/src/xim/stimulus.c +++ b/xts5/src/xim/stimulus.c @@ -206,8 +206,8 @@ Bool xim_stimulus_open(plocale,style) char str[MAXLINELEN]; int key; Bool got_stimulus; - int pe_style,status_style,tstyle; - char *tstr,*pstr; + int pe_style, status_style; + char *pstr; /* build a file name */ /* form is im<test#>.<locale>.stimulus */ @@ -328,7 +328,6 @@ Bool xim_stimulus_open(plocale,style) Bool xim_stimulus_read(ic) XIC ic; { - char str[MAXLINELEN]; char *pstr,*tstr; char id[MAXIDLEN]; Bool in_stimulus,got_stimulus_key,stimulus_end; @@ -337,7 +336,6 @@ Bool xim_stimulus_read(ic) wchar_t *pe_wstr; Window win,old_win; int revert_to; - char *p; if(fp_stimulus == NULL) return(False); diff --git a/xts5/src/xim/xim_cb.c b/xts5/src/xim/xim_cb.c index 6275a13b..9c1523af 100644 --- a/xts5/src/xim/xim_cb.c +++ b/xts5/src/xim/xim_cb.c @@ -621,7 +621,6 @@ xim_open_files(locale,pstyle) char *locale; XIMStyle *pstyle; { - char resp_locale[MAXIDLEN]; XIMStyle style,resp_style; /* open stimulus file for the given locale and the get the styles */ |