mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
Xext: Xi: use return value of X_SEND_REPLY_SIMPLE()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
a4d08427cf
commit
a6f629cbaa
@@ -57,8 +57,8 @@ ProcBigReqDispatch(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&reply.max_request_size);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -239,8 +239,8 @@ ProcDamageQueryVersion(ClientPtr client)
|
||||
swapl(&rep.majorVersion);
|
||||
swapl(&rep.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, rep);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
11
Xext/dpms.c
11
Xext/dpms.c
@@ -324,8 +324,8 @@ ProcDPMSGetVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -338,8 +338,7 @@ ProcDPMSCapable(ClientPtr client)
|
||||
|
||||
REQUEST_SIZE_MATCH(xDPMSCapableReq);
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -359,8 +358,8 @@ ProcDPMSGetTimeouts(ClientPtr client)
|
||||
swaps(&reply.suspend);
|
||||
swaps(&reply.off);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -92,8 +92,7 @@ ProcGEQueryVersion(ClientPtr client)
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/************************************************************/
|
||||
|
||||
@@ -891,8 +891,8 @@ ProcPanoramiXQueryVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -919,9 +919,8 @@ ProcPanoramiXGetState(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&reply.window);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -948,8 +947,8 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&reply.window);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -989,8 +988,8 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
|
||||
swapl(&reply.window);
|
||||
swapl(&reply.screen);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -1012,8 +1011,8 @@ ProcXineramaIsActive(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&reply.state);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
@@ -615,8 +615,8 @@ PanoramiXGetGeometry(ClientPtr client)
|
||||
swaps(&reply.height);
|
||||
swaps(&reply.borderWidth);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -696,8 +696,8 @@ PanoramiXTranslateCoords(ClientPtr client)
|
||||
swaps(&reply.dstX);
|
||||
swaps(&reply.dstY);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
@@ -599,8 +599,8 @@ ProcScreenSaverQueryVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -664,8 +664,8 @@ ProcScreenSaverQueryInfo(ClientPtr client)
|
||||
swapl(&reply.idle);
|
||||
swapl(&reply.eventMask);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -364,8 +364,8 @@ ProcSecurityQueryVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
} /* ProcSecurityQueryVersion */
|
||||
|
||||
static int
|
||||
|
||||
11
Xext/shape.c
11
Xext/shape.c
@@ -217,8 +217,8 @@ ProcShapeQueryVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -706,8 +706,8 @@ ProcShapeQueryExtents(ClientPtr client)
|
||||
swaps(&reply.widthClipShape);
|
||||
swaps(&reply.heightClipShape);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/ static int
|
||||
@@ -961,8 +961,7 @@ ProcShapeInputSelected(ClientPtr client)
|
||||
.enabled = enabled,
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
16
Xext/shm.c
16
Xext/shm.c
@@ -272,8 +272,8 @@ ProcShmQueryVersion(ClientPtr client)
|
||||
swaps(&reply.uid);
|
||||
swaps(&reply.gid);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -698,8 +698,8 @@ ShmGetImage(ClientPtr client, xShmGetImageReq *stuff)
|
||||
swapl(&xgi.visual);
|
||||
swapl(&xgi.size);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, xgi);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, xgi);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -894,8 +894,8 @@ ProcShmGetImage(ClientPtr client)
|
||||
swapl(&xgi.visual);
|
||||
swapl(&xgi.size);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, xgi);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, xgi);
|
||||
#else
|
||||
return ShmGetImage(client, stuff);
|
||||
#endif /* XINERAMA */
|
||||
@@ -1321,8 +1321,8 @@ ProcShmCreateSegment(ClientPtr client)
|
||||
close(fd);
|
||||
return BadAlloc;
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
#endif /* SHM_FD_PASSING */
|
||||
|
||||
|
||||
16
Xext/sync.c
16
Xext/sync.c
@@ -1269,8 +1269,7 @@ ProcSyncInitialize(ClientPtr client)
|
||||
|
||||
REQUEST_SIZE_MATCH(xSyncInitializeReq);
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1391,8 +1390,7 @@ ProcSyncGetPriority(ClientPtr client)
|
||||
swapl(&reply.priority);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1699,8 +1697,8 @@ ProcSyncQueryCounter(ClientPtr client)
|
||||
swapl(&reply.value_hi);
|
||||
swapl(&reply.value_lo);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1894,8 +1892,7 @@ ProcSyncQueryAlarm(ClientPtr client)
|
||||
swapl(&reply.delta_lo);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -2059,8 +2056,7 @@ ProcSyncQueryFence(ClientPtr client)
|
||||
.triggered = pFence->funcs.CheckTriggered(pFence)
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -208,8 +208,8 @@ ProcVidModeQueryVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -297,12 +297,10 @@ ProcVidModeGetModeLine(ClientPtr client)
|
||||
.flags = reply.flags,
|
||||
.privsize = reply.privsize
|
||||
};
|
||||
X_SEND_REPLY_SIMPLE(client, oldrep);
|
||||
return X_SEND_REPLY_SIMPLE(client, oldrep);
|
||||
}
|
||||
else {
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static void fillModeInfoV1(x_rpcbuf_t *rpcbuf, int dotClock,
|
||||
@@ -1150,10 +1148,10 @@ VidModeValidateModeLine(ClientPtr client, xXF86VidModeValidateModeLineReq *stuff
|
||||
if (client->swapped) {
|
||||
swapl(&reply.status);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
|
||||
DebugF("ValidateModeLine - Succeeded (status = %d)\n", status);
|
||||
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1442,8 +1440,8 @@ ProcVidModeGetViewPort(ClientPtr client)
|
||||
swapl(&reply.x);
|
||||
swapl(&reply.y);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1613,8 +1611,8 @@ ProcVidModeGetGamma(ClientPtr client)
|
||||
swapl(&reply.green);
|
||||
swapl(&reply.blue);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1767,8 +1765,8 @@ ProcVidModeGetPermissions(ClientPtr client)
|
||||
if (client->swapped) {
|
||||
swapl(&reply.permissions);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -64,8 +64,8 @@ ProcXCMiscGetVersion(ClientPtr client)
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -84,8 +84,8 @@ ProcXCMiscGetXIDRange(ClientPtr client)
|
||||
swapl(&reply.start_id);
|
||||
swapl(&reply.count);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -192,8 +192,8 @@ ProcXResQueryVersion(ClientPtr client)
|
||||
swaps(&reply.server_major);
|
||||
swaps(&reply.server_minor);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -339,8 +339,8 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
|
||||
swapl(&reply.bytes);
|
||||
swapl(&reply.bytes_overflow);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
/** @brief Finds out if a client's information need to be put into the
|
||||
|
||||
@@ -123,8 +123,7 @@ ProcXvMCQueryVersion(ClientPtr client)
|
||||
swapl(&reply.minor);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
return X_SEND_REPLY_SIMPLE(client, reply);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
Reference in New Issue
Block a user