XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: small diff files more C99 scoped declaration

Browse Source 
Signed-off-by: SuperDuperDeou <87223140+SuperDuperDeou@users.noreply.github.com>
This commit is contained in:
SuperDuperDeou
2025-07-21 12:22:41 +02:00
committed by Enrico Weigelt
parent 3feeeb9365
commit 45434690cc
13 changed files with 77 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dix/atom.c
View File

@@ -76,12 +76,11 @@ Atom
MakeAtom(const char *string, unsigned len, Bool makeit)
{
NodePtr *np;
unsigned i;
int comp;
unsigned int fp = 0;
np = &atomRoot;
for (i = 0; i < (len + 1) / 2; i++) {
for (unsigned int i = 0; i < (len + 1) / 2; i++) {
fp = fp * 27 + string[i];
fp = fp * 27 + string[len - 1 - i];
}

25
dix/cursor.c
View File

@@ -105,7 +105,6 @@ FreeCursorBits(CursorBitsPtr bits)
int
FreeCursor(void *value, XID cid)
{
int nscr;
CursorPtr pCurs = (CursorPtr) value;
ScreenPtr pscr;
@@ -118,7 +117,7 @@ FreeCursor(void *value, XID cid)
BUG_WARN(CursorRefCount(pCurs) < 0);
for (nscr = 0; nscr < screenInfo.numScreens; nscr++) {
for (int nscr = 0; nscr < screenInfo.numScreens; nscr++) {
pscr = screenInfo.screens[nscr];
(void) (*pscr->UnrealizeCursor) (pDev, pscr, pCurs);
}
@@ -185,13 +184,11 @@ CheckForEmptyMask(CursorBitsPtr bits)
static int
RealizeCursorAllScreens(CursorPtr pCurs)
{
DeviceIntPtr pDev;
ScreenPtr pscr;
int nscr;
for (nscr = 0; nscr < screenInfo.numScreens; nscr++) {
for (int nscr = 0; nscr < screenInfo.numScreens; nscr++) {
pscr = screenInfo.screens[nscr];
for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
for (DeviceIntPtr pDev = inputInfo.devices; pDev; pDev = pDev->next) {
if (DevHasCursor(pDev)) {
if (!(*pscr->RealizeCursor) (pDev, pscr, pCurs)) {
/* Realize failed for device pDev on screen pscr.
@@ -291,20 +288,20 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
*ppCurs = pCurs;
if (argb) {
size_t i, size = bits->width * bits->height;
size_t size = bits->width * bits->height;
for (i = 0; i < size; i++) {
for (size_t i = 0; i < size; i++) {
if ((argb[i] & 0xff000000) == 0 && (argb[i] & 0xffffff) != 0) {
/* ARGB data doesn't seem pre-multiplied, fix it */
for (i = 0; i < size; i++) {
for (size_t j = 0; j < size; j++) {
CARD32 a, ar, ag, ab;
a = argb[i] >> 24;
ar = a * ((argb[i] >> 16) & 0xff) / 0xff;
ag = a * ((argb[i] >> 8) & 0xff) / 0xff;
ab = a * (argb[i] & 0xff) / 0xff;
a = argb[j] >> 24;
ar = a * ((argb[j] >> 16) & 0xff) / 0xff;
ag = a * ((argb[j] >> 8) & 0xff) / 0xff;
ab = a * (argb[j] & 0xff) / 0xff;
argb[i] = a << 24 | ar << 16 | ag << 8 | ab;
argb[j] = a << 24 | ar << 16 | ag << 8 | ab;
}
break;

35
dix/eventconvert.c
View File

@@ -411,9 +411,8 @@ static int
countValuators(DeviceEvent *ev, int *first)
{
int first_valuator = -1, last_valuator = -1, num_valuators = 0;
int i;
for (i = 0; i < sizeof(ev->valuators.mask) * 8; i++) {
for (int i = 0; i < sizeof(ev->valuators.mask) * 8; i++) {
if (BitIsOn(ev->valuators.mask, i)) {
if (first_valuator == -1)
first_valuator = i;
@@ -432,7 +431,6 @@ countValuators(DeviceEvent *ev, int *first)
static int
getValuatorEvents(DeviceEvent *ev, deviceValuator * xv)
{
int i;
int state = 0;
int first_valuator, num_valuators;
@@ -448,9 +446,8 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator * xv)
state |= (dev && dev->button) ? (dev->button->state) : 0;
}
for (i = 0; i < num_valuators; i += 6, xv++) {
for (int i = 0; i < num_valuators; i += 6, xv++) {
INT32 *valuators = &xv->valuator0; // Treat all 6 vals as an array
int j;
xv->type = DeviceValuator;
xv->first_valuator = first_valuator + i;
@@ -460,7 +457,7 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator * xv)
/* Unset valuators in masked valuator events have the proper data values
* in the case of an absolute axis in between two set valuators. */
for (j = 0; j < xv->num_valuators; j++)
for (int j = 0; j < xv->num_valuators; j++)
valuators[j] = ev->valuators.data[xv->first_valuator + j];
if (i + 6 < num_valuators)
@@ -474,7 +471,6 @@ static int
appendKeyInfo(DeviceChangedEvent *dce, xXIKeyInfo * info)
{
uint32_t *kc;
int i;
info->type = XIKeyClass;
info->num_keycodes = dce->keys.max_keycode - dce->keys.min_keycode + 1;
@@ -482,7 +478,7 @@ appendKeyInfo(DeviceChangedEvent *dce, xXIKeyInfo * info)
info->sourceid = dce->sourceid;
kc = (uint32_t *) &info[1];
for (i = 0; i < info->num_keycodes; i++)
for (int i = 0; i < info->num_keycodes; i++)
*kc++ = i + dce->keys.min_keycode;
return info->length * 4;
@@ -581,11 +577,9 @@ eventToDeviceChanged(DeviceChangedEvent *dce, xEvent **xi)
len += pad_to_int32(bits_to_bytes(dce->buttons.num_buttons));
}
if (dce->num_valuators) {
int i;
len += sizeof(xXIValuatorInfo) * dce->num_valuators;
for (i = 0; i < dce->num_valuators; i++)
for (int i = 0; i < dce->num_valuators; i++)
if (dce->valuators[i].scroll.type != SCROLL_TYPE_NONE)
len += sizeof(xXIScrollInfo);
}
@@ -626,13 +620,11 @@ eventToDeviceChanged(DeviceChangedEvent *dce, xEvent **xi)
}
if (dce->num_valuators) {
int i;
dcce->num_classes += dce->num_valuators;
for (i = 0; i < dce->num_valuators; i++)
for (int i = 0; i < dce->num_valuators; i++)
ptr += appendValuatorInfo(dce, (xXIValuatorInfo *) ptr, i);
for (i = 0; i < dce->num_valuators; i++) {
for (int i = 0; i < dce->num_valuators; i++) {
if (dce->valuators[i].scroll.type != SCROLL_TYPE_NONE) {
dcce->num_classes++;
ptr += appendScrollInfo(dce, (xXIScrollInfo *) ptr, i);
@@ -649,10 +641,9 @@ static int
count_bits(unsigned char *ptr, int len)
{
int bits = 0;
unsigned int i;
unsigned char x;
for (i = 0; i < len; i++) {
for (unsigned int i = 0; i < len; i++) {
x = ptr[i];
while (x > 0) {
bits += (x & 0x1);
@@ -667,7 +658,7 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
{
int len = sizeof(xXIDeviceEvent);
xXIDeviceEvent *xde;
int i, btlen, vallen;
int btlen, vallen;
char *ptr;
FP3232 *axisval;
@@ -728,14 +719,14 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
xde->group.effective_group = ev->group.effective;
ptr = (char *) &xde[1];
for (i = 0; i < sizeof(ev->buttons) * 8; i++) {
for (int i = 0; i < sizeof(ev->buttons) * 8; i++) {
if (BitIsOn(ev->buttons, i))
SetBit(ptr, i);
}
ptr += xde->buttons_len * 4;
axisval = (FP3232 *) (ptr + xde->valuators_len * 4);
for (i = 0; i < MAX_VALUATORS; i++) {
for (int i = 0; i < MAX_VALUATORS; i++) {
if (BitIsOn(ev->valuators.mask, i)) {
SetBit(ptr, i);
*axisval = double_to_fp3232(ev->valuators.data[i]);
@@ -774,7 +765,7 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
{
xXIRawEvent *raw;
int vallen, nvals;
int i, len = sizeof(xXIRawEvent);
int len = sizeof(xXIRawEvent);
char *ptr;
FP3232 *axisval, *axisval_raw;
@@ -802,7 +793,7 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
ptr = (char *) &raw[1];
axisval = (FP3232 *) (ptr + raw->valuators_len * 4);
axisval_raw = axisval + nvals;
for (i = 0; i < MAX_VALUATORS; i++) {
for (int i = 0; i < MAX_VALUATORS; i++) {
if (BitIsOn(ev->valuators.mask, i)) {
SetBit(ptr, i);
*axisval = double_to_fp3232(ev->valuators.data[i]);

6
dix/extension.c
View File

@@ -333,9 +333,7 @@ ProcListExtensions(ClientPtr client)
buffer = NULL;
if (NumExtensions && extensions) {
int i;
for (i = 0; i < NumExtensions; i++) {
for (int i = 0; i < NumExtensions; i++) {
/* call callbacks to find out whether to show extension */
if (!ExtensionAvailable(client, extensions[i]))
continue;
@@ -347,7 +345,7 @@ ProcListExtensions(ClientPtr client)
buffer = bufptr = calloc(1, total_length);
if (!buffer)
return BadAlloc;
for (i = 0; i < NumExtensions; i++) {
for (int i = 0; i < NumExtensions; i++) {
int len;
if (!ExtensionAvailable(client, extensions[i]))

17
dix/gc.c
View File

@@ -430,15 +430,14 @@ int
ChangeGCXIDs(ClientPtr client, GCPtr pGC, BITS32 mask, CARD32 *pC32)
{
ChangeGCVal vals[GCLastBit + 1];
int i;
if (mask & ~GCAllBits) {
client->errorValue = mask;
return BadValue;
}
for (i = Ones(mask); i--;)
for (int i = Ones(mask); i--;)
vals[i].val = pC32[i];
for (i = 0; i < ARRAY_SIZE(xidfields); ++i) {
for (int i = 0; i < ARRAY_SIZE(xidfields); ++i) {
int offset, rc;
if (!(mask & xidfields[i].mask))
@@ -724,14 +723,13 @@ CopyGC(GCPtr pgcSrc, GCPtr pgcDst, BITS32 mask)
}
}
else {
unsigned int i;
unsigned char *dash = calloc(pgcSrc->numInDashList, sizeof(unsigned char));
if (dash) {
if (pgcDst->dash != DefaultDash)
free(pgcDst->dash);
pgcDst->numInDashList = pgcSrc->numInDashList;
pgcDst->dash = dash;
for (i = 0; i < pgcSrc->numInDashList; i++)
for (unsigned int i = 0; i < pgcSrc->numInDashList; i++)
dash[i] = pgcSrc->dash[i];
}
else
@@ -819,7 +817,6 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
void
FreeGCperDepth(ScreenPtr pScreen)
{
int i;
GCPtr *ppGC;
if (!pScreen)
@@ -827,7 +824,7 @@ FreeGCperDepth(ScreenPtr pScreen)
ppGC = pScreen->GCperDepth;
for (i = 0; i <= pScreen->numDepths; i++) {
for (int i = 0; i <= pScreen->numDepths; i++) {
(void) FreeGC(ppGC[i], (XID) 0);
ppGC[i] = NULL;
}
@@ -836,7 +833,6 @@ FreeGCperDepth(ScreenPtr pScreen)
Bool
CreateGCperDepth(int screenNum)
{
int i;
ScreenPtr pScreen;
DepthPtr pDepth;
GCPtr *ppGC;
@@ -851,7 +847,7 @@ CreateGCperDepth(int screenNum)
return FALSE;
pDepth = pScreen->allowedDepths;
for (i = 0; i < pScreen->numDepths; i++, pDepth++) {
for (int i = 0; i < pScreen->numDepths; i++, pDepth++) {
if (!(ppGC[i + 1] = CreateScratchGC(pScreen, pDepth->depth))) {
for (; i >= 0; i--)
(void) FreeGC(ppGC[i], (XID) 0);
@@ -1032,10 +1028,9 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
GCPtr
GetScratchGC(unsigned depth, ScreenPtr pScreen)
{
int i;
GCPtr pGC;
for (i = 0; i <= pScreen->numDepths; i++) {
for (int i = 0; i <= pScreen->numDepths; i++) {
pGC = pScreen->GCperDepth[i];
if (pGC && pGC->depth == depth && !pGC->scratch_inuse) {
pGC->scratch_inuse = TRUE;

10
dix/gestures.c
View File

@@ -282,8 +282,8 @@ GestureSetupListener(DeviceIntPtr dev, GestureInfoPtr gi, InternalEvent *ev)
/* Find the first client with an applicable event selection,
* going from deepest child window back up to the root window. */
for (i = sprite->spriteTraceGood - 1; i >= 0; i--) {
win = sprite->spriteTrace[i];
for (int j = sprite->spriteTraceGood - 1; j >= 0; j--) {
win = sprite->spriteTrace[j];
GestureAddRegularListener(dev, gi, win, ev);
if (gi->has_listener)
return;
@@ -296,13 +296,12 @@ void
GestureListenerGone(XID resource)
{
GestureInfoPtr gi;
DeviceIntPtr dev;
InternalEvent *events = InitEventList(GetMaximumEventsNum());
if (!events)
FatalError("GestureListenerGone: couldn't allocate events\n");
for (dev = inputInfo.devices; dev; dev = dev->next) {
for (DeviceIntPtr dev = inputInfo.devices; dev; dev = dev->next) {
if (!dev->gesture)
continue;
@@ -334,12 +333,11 @@ GestureEndActiveGestures(DeviceIntPtr dev)
input_lock();
mieqProcessInputEvents();
if (g->gesture.active) {
int j;
int type = GetXI2Type(GestureTypeToEnd(g->gesture.type));
int nevents = GetGestureEvents(eventlist, dev, type, g->gesture.num_touches,
0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
for (j = 0; j < nevents; j++)
for (int j = 0; j < nevents; j++)
mieqProcessDeviceEvent(dev, eventlist + j, NULL);
}
input_unlock();

15
dix/main.c
View File

@@ -130,7 +130,6 @@ CallbackListPtr PostInitRootWindowCallback = NULL;
int
dix_main(int argc, char *argv[], char *envp[])
{
int i;
HWEventQueueType alwaysCheckForInput[2];
display = "0";
@@ -157,7 +156,7 @@ dix_main(int argc, char *argv[], char *envp[])
OsInit();
if (serverGeneration == 1) {
CreateWellKnownSockets();
for (i = 1; i < LimitClients; i++)
for (int i = 1; i < LimitClients; i++)
clients[i] = NULL;
serverClient = calloc(1, sizeof(ClientRec));
if (!serverClient)
@@ -202,7 +201,7 @@ dix_main(int argc, char *argv[], char *envp[])
InitExtensions(argc, argv);
LogMessageVerb(X_INFO, 1, "Extensions initialized\n");
for (i = 0; i < screenInfo.numGPUScreens; i++) {
for (int i = 0; i < screenInfo.numGPUScreens; i++) {
ScreenPtr pScreen = screenInfo.gpuscreens[i];
if (!PixmapScreenInit(pScreen))
FatalError("failed to create screen pixmap properties");
@@ -210,7 +209,7 @@ dix_main(int argc, char *argv[], char *envp[])
FatalError("failed to create screen resources");
}
for (i = 0; i < screenInfo.numScreens; i++) {
for (int i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
if (!PixmapScreenInit(pScreen))
@@ -248,7 +247,7 @@ dix_main(int argc, char *argv[], char *envp[])
PanoramiXConsolidate();
#endif /* XINERAMA */
for (i = 0; i < screenInfo.numScreens; i++) {
for (int i = 0; i < screenInfo.numScreens; i++) {
InitRootWindow(screenInfo.screens[i]->root);
CallCallbacks(&PostInitRootWindowCallback, screenInfo.screens[i]);
}
@@ -313,20 +312,20 @@ dix_main(int argc, char *argv[], char *envp[])
InputThreadFini();
for (i = 0; i < screenInfo.numScreens; i++)
for (int i = 0; i < screenInfo.numScreens; i++)
screenInfo.screens[i]->root = NullWindow;
CloseDownDevices();
CloseDownEvents();
for (i = screenInfo.numGPUScreens - 1; i >= 0; i--) {
for (int i = screenInfo.numGPUScreens - 1; i >= 0; i--) {
dixFreeScreen(screenInfo.gpuscreens[i]);
screenInfo.numGPUScreens = i;
}
memset(&screenInfo.numGPUScreens, 0, sizeof(screenInfo.numGPUScreens));
for (i = screenInfo.numScreens - 1; i >= 0; i--) {
for (int i = screenInfo.numScreens - 1; i >= 0; i--) {
dixFreeScreen(screenInfo.screens[i]);
screenInfo.numScreens = i;
}

8
dix/property.c
View File

@@ -78,14 +78,13 @@ static void
PrintPropertys(WindowPtr pWin)
{
PropertyPtr pProp;
int j;
pProp = pWin->properties;
while (pProp) {
ErrorF("[dix] %x %x\n", pProp->propertyName, pProp->type);
ErrorF("[dix] property format: %d\n", pProp->format);
ErrorF("[dix] property data: \n");
for (j = 0; j < (pProp->format / 8) * pProp->size; j++)
for (int j = 0; j < (pProp->format / 8) * pProp->size; j++)
ErrorF("[dix] %c\n", pProp->data[j]);
pProp = pProp->next;
}
@@ -660,7 +659,6 @@ ProcListProperties(ClientPtr client)
Atom *pAtoms = NULL, *temppAtoms;
int rc, numProps = 0;
WindowPtr pWin;
PropertyPtr pProp, realProp;
REQUEST(xResourceReq);
@@ -669,7 +667,7 @@ ProcListProperties(ClientPtr client)
if (rc != Success)
return rc;
for (pProp = pWin->properties; pProp; pProp = pProp->next)
for (PropertyPtr pProp = pWin->properties; pProp; pProp = pProp->next)
numProps++;
if (numProps) {
@@ -679,7 +677,7 @@ ProcListProperties(ClientPtr client)
numProps = 0;
temppAtoms = pAtoms;
for (pProp = pWin->properties; pProp; pProp = pProp->next) {
for (PropertyPtr realProp, pProp = pWin->properties; pProp; pProp = pProp->next) {
realProp = pProp;
rc = XaceHookPropertyAccess(client, pWin, &realProp, DixGetAttrAccess);
if (rc == Success && realProp == pProp) {

3
dix/ptrveloc.c
View File

@@ -397,7 +397,6 @@ DeletePredictableAccelerationProperties(DeviceIntPtr dev,
{
DeviceVelocityPtr vel;
Atom prop;
int i;
prop = XIGetKnownProperty(ACCEL_PROP_VELOCITY_SCALING);
XIDeleteDeviceProperty(dev, prop, FALSE);
@@ -410,7 +409,7 @@ DeletePredictableAccelerationProperties(DeviceIntPtr dev,
vel = GetDevicePredictableAccelData(dev);
if (vel) {
for (i = 0; i < scheme->num_prop_handlers; i++)
for (int i = 0; i < scheme->num_prop_handlers; i++)
if (scheme->prop_handlers[i])
XIUnregisterPropertyHandler(dev, scheme->prop_handlers[i]);
}

24
dix/region.c
View File

@@ -278,7 +278,6 @@ void
RegionPrint(RegionPtr rgn)
{
int num, size;
int i;
BoxPtr rects;
num = RegionNumRects(rgn);
@@ -287,7 +286,7 @@ RegionPrint(RegionPtr rgn)
ErrorF("[mi] num: %d size: %d\n", num, size);
ErrorF("[mi] extents: %d %d %d %d\n",
rgn->extents.x1, rgn->extents.y1, rgn->extents.x2, rgn->extents.y2);
for (i = 0; i < num; i++)
for (int i = 0; i < num; i++)
ErrorF("[mi] %d %d %d %d \n",
rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2);
ErrorF("[mi] \n");
@@ -297,7 +296,7 @@ RegionPrint(RegionPtr rgn)
Bool
RegionIsValid(RegionPtr reg)
{
int i, numRects;
int numRects;
if ((reg->extents.x1 > reg->extents.x2) ||
(reg->extents.y1 > reg->extents.y2))
@@ -317,7 +316,7 @@ RegionIsValid(RegionPtr reg)
box = *pboxP;
box.y2 = pboxP[numRects - 1].y2;
pboxN = pboxP + 1;
for (i = numRects; --i > 0; pboxP++, pboxN++) {
for (int i = numRects; --i > 0; pboxP++, pboxN++) {
if ((pboxN->x1 >= pboxN->x2) || (pboxN->y1 >= pboxN->y2))
return FALSE;
if (pboxN->x1 < box.x1)
@@ -1150,8 +1149,6 @@ RegionValidate(RegionPtr badreg, Bool *pOverlap)
int numRects; /* Original numRects for badreg */
int numRI; /* Number of entries used in ri */
int sizeRI; /* Number of entries available in ri */
int i; /* Index into rects */
int j; /* Index into ri */
RegionInfo *rit; /* &ri[j] */
RegionPtr reg; /* ri[j].reg */
BoxPtr box; /* Current box in rects */
@@ -1208,10 +1205,11 @@ RegionValidate(RegionPtr badreg, Bool *pOverlap)
forget it. Try the next region. If it doesn't fit cleanly into any
region, make a new one. */
for (i = numRects; --i > 0;) {
for (int i = numRects; --i > 0;) {
box++;
/* Look for a region to append box to */
for (j = numRI, rit = ri; --j >= 0; rit++) {
rit = ri;
for (int j = numRI; --j >= 0; rit++) {
reg = &rit->reg;
riBox = RegionEnd(reg);
@@ -1270,7 +1268,8 @@ RegionValidate(RegionPtr badreg, Bool *pOverlap)
/* Make a final pass over each region in order to Coalesce and set
extents.x2 and extents.y2 */
for (j = numRI, rit = ri; --j >= 0; rit++) {
rit = ri;
for (int j = numRI; --j >= 0; rit++) {
reg = &rit->reg;
riBox = RegionEnd(reg);
reg->extents.y2 = riBox->y2;
@@ -1287,7 +1286,7 @@ RegionValidate(RegionPtr badreg, Bool *pOverlap)
while (numRI > 1) {
int half = numRI / 2;
for (j = numRI & 1; j < (half + (numRI & 1)); j++) {
for (int j = numRI & 1; j < (half + (numRI & 1)); j++) {
reg = &ri[j].reg;
hreg = &ri[j + half].reg;
if (!RegionOp(reg, reg, hreg, RegionUnionO, TRUE, TRUE, pOverlap))
@@ -1309,7 +1308,7 @@ RegionValidate(RegionPtr badreg, Bool *pOverlap)
good(badreg);
return ret;
bail:
for (i = 0; i < numRI; i++)
for (int i = 0; i < numRI; i++)
xfreeData(&ri[i].reg);
free(ri);
return RegionBreak(badreg);
@@ -1322,7 +1321,6 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype)
RegionPtr pRgn;
size_t rgnSize;
BoxPtr pBox;
int i;
int x1, y1, x2, y2;
pRgn = RegionCreate(NullBox, 0);
@@ -1353,7 +1351,7 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype)
return pRgn;
}
pBox = (BoxPtr) (pData + 1);
for (i = nrects; --i >= 0; prect++) {
for (int i = nrects; --i >= 0; prect++) {
x1 = prect->x;
y1 = prect->y;
if ((x2 = x1 + (int) prect->width) > MAXSHORT)

8
dix/selection.c
View File

@@ -126,9 +126,7 @@ CallSelectionCallback(Selection * pSel, ClientPtr client,
void
DeleteWindowFromAnySelections(WindowPtr pWin)
{
Selection *pSel;
for (pSel = CurrentSelections; pSel; pSel = pSel->next)
for (Selection *pSel = CurrentSelections; pSel; pSel = pSel->next)
if (pSel->pWin == pWin) {
CallSelectionCallback(pSel, NULL, SelectionWindowDestroy);
@@ -141,9 +139,7 @@ DeleteWindowFromAnySelections(WindowPtr pWin)
void
DeleteClientFromAnySelections(ClientPtr client)
{
Selection *pSel;
for (pSel = CurrentSelections; pSel; pSel = pSel->next)
for (Selection *pSel = CurrentSelections; pSel; pSel = pSel->next)
if (pSel->client == client) {
CallSelectionCallback(pSel, NULL, SelectionClientClose);

33
dix/swaprep.c
View File

@@ -67,10 +67,8 @@ static void SwapCharInfo(xCharInfo * pInfo);
void _X_COLD
Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{
int i;
size >>= 2;
for (i = 0; i < size; i++)
for (int i = 0; i < size; i++)
/* brackets are mandatory here, because "swapl" macro expands
to several statements */
{
@@ -209,7 +207,6 @@ SwapFontInfo(xQueryFontReply * pr)
void _X_COLD
SwapFont(xQueryFontReply * pr, Bool hasGlyphs)
{
unsigned i;
xCharInfo *pxci;
unsigned nchars, nprops;
char *pby;
@@ -222,7 +219,7 @@ SwapFont(xQueryFontReply * pr, Bool hasGlyphs)
pby = (char *) &pr[1];
/* Font properties are an atom and either an int32 or a CARD32, so
* they are always 2 4 byte values */
for (i = 0; i < nprops; i++) {
for (unsigned i = 0; i < nprops; i++) {
swapl((int *) pby);
pby += 4;
swapl((int *) pby);
@@ -230,7 +227,7 @@ SwapFont(xQueryFontReply * pr, Bool hasGlyphs)
}
if (hasGlyphs) {
pxci = (xCharInfo *) pby;
for (i = 0; i < nchars; i++, pxci++)
for (unsigned i = 0; i < nchars; i++, pxci++)
SwapCharInfo(pxci);
}
}
@@ -659,7 +656,7 @@ SwapVisual(xVisualType * pVis, xVisualType * pVisT)
void _X_COLD
SwapConnSetupInfo(char *pInfo, char *pInfoT)
{
int i, j, k;
int nbytesVendor;
xConnSetup *pConnSetup = (xConnSetup *) pInfo;
xDepth *depth;
xWindowRoot *root;
@@ -669,30 +666,30 @@ SwapConnSetupInfo(char *pInfo, char *pInfoT)
pInfoT += sizeof(xConnSetup);
/* Copy the vendor string */
i = pad_to_int32(pConnSetup->nbytesVendor);
memcpy(pInfoT, pInfo, i);
pInfo += i;
pInfoT += i;
nbytesVendor = pad_to_int32(pConnSetup->nbytesVendor);
memcpy(pInfoT, pInfo, nbytesVendor);
pInfo += nbytesVendor;
pInfoT += nbytesVendor;
/* The Pixmap formats don't need to be swapped, just copied. */
i = sizeof(xPixmapFormat) * pConnSetup->numFormats;
memcpy(pInfoT, pInfo, i);
pInfo += i;
pInfoT += i;
nbytesVendor = sizeof(xPixmapFormat) * pConnSetup->numFormats;
memcpy(pInfoT, pInfo, nbytesVendor);
pInfo += nbytesVendor;
pInfoT += nbytesVendor;
for (i = 0; i < pConnSetup->numRoots; i++) {
for (int i = 0; i < pConnSetup->numRoots; i++) {
root = (xWindowRoot *) pInfo;
SwapWinRoot(root, (xWindowRoot *) pInfoT);
pInfo += sizeof(xWindowRoot);
pInfoT += sizeof(xWindowRoot);
for (j = 0; j < root->nDepths; j++) {
for (int j = 0; j < root->nDepths; j++) {
depth = (xDepth *) pInfo;
((xDepth *) pInfoT)->depth = depth->depth;
cpswaps(depth->nVisuals, ((xDepth *) pInfoT)->nVisuals);
pInfo += sizeof(xDepth);
pInfoT += sizeof(xDepth);
for (k = 0; k < depth->nVisuals; k++) {
for (int k = 0; k < depth->nVisuals; k++) {
SwapVisual((xVisualType *) pInfo, (xVisualType *) pInfoT);
pInfo += sizeof(xVisualType);
pInfoT += sizeof(xVisualType);

3
dix/swapreq.c
View File

@@ -752,14 +752,13 @@ SwapColorItem(xColorItem * pItem)
int _X_COLD
SProcStoreColors(ClientPtr client)
{
long count;
xColorItem *pItem;
REQUEST(xStoreColorsReq);
REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
swapl(&stuff->cmap);
pItem = (xColorItem *) &stuff[1];
for (count = ((client->req_len << 2) - sizeof(xStoreColorsReq)) / sizeof(xColorItem); --count >= 0;)
for (long count = ((client->req_len << 2) - sizeof(xStoreColorsReq)) / sizeof(xColorItem); --count >= 0;)
SwapColorItem(pItem++);
return ((*ProcVector[X_StoreColors]) (client));
}