mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
Xext: canonical naming for reply structs
Let all reply structs be called `reply`. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
e6c7bd7c86
commit
cd86e5f69a
38
Xext/shape.c
38
Xext/shape.c
@@ -208,16 +208,16 @@ ProcShapeQueryVersion(ClientPtr client)
|
||||
{
|
||||
REQUEST_SIZE_MATCH(xShapeQueryVersionReq);
|
||||
|
||||
xShapeQueryVersionReply rep = {
|
||||
xShapeQueryVersionReply reply = {
|
||||
.majorVersion = SERVER_SHAPE_MAJOR_VERSION,
|
||||
.minorVersion = SERVER_SHAPE_MINOR_VERSION
|
||||
};
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&rep.majorVersion);
|
||||
swaps(&rep.minorVersion);
|
||||
swaps(&reply.majorVersion);
|
||||
swaps(&reply.minorVersion);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
}
|
||||
|
||||
@@ -649,7 +649,7 @@ ProcShapeQueryExtents(ClientPtr client)
|
||||
shapeBox.y2 = pWin->drawable.height;
|
||||
}
|
||||
|
||||
xShapeQueryExtentsReply rep = {
|
||||
xShapeQueryExtentsReply reply = {
|
||||
.boundingShaped = (wBoundingShape(pWin) != 0),
|
||||
.clipShaped = (wClipShape(pWin) != 0),
|
||||
.xBoundingShape = boundBox.x1,
|
||||
@@ -663,16 +663,16 @@ ProcShapeQueryExtents(ClientPtr client)
|
||||
};
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&rep.xBoundingShape);
|
||||
swaps(&rep.yBoundingShape);
|
||||
swaps(&rep.widthBoundingShape);
|
||||
swaps(&rep.heightBoundingShape);
|
||||
swaps(&rep.xClipShape);
|
||||
swaps(&rep.yClipShape);
|
||||
swaps(&rep.widthClipShape);
|
||||
swaps(&rep.heightClipShape);
|
||||
swaps(&reply.xBoundingShape);
|
||||
swaps(&reply.yBoundingShape);
|
||||
swaps(&reply.widthBoundingShape);
|
||||
swaps(&reply.heightBoundingShape);
|
||||
swaps(&reply.xClipShape);
|
||||
swaps(&reply.yClipShape);
|
||||
swaps(&reply.widthClipShape);
|
||||
swaps(&reply.heightClipShape);
|
||||
}
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
}
|
||||
|
||||
@@ -915,11 +915,11 @@ ProcShapeInputSelected(ClientPtr client)
|
||||
}
|
||||
}
|
||||
|
||||
xShapeInputSelectedReply rep = {
|
||||
xShapeInputSelectedReply reply = {
|
||||
.enabled = enabled,
|
||||
};
|
||||
|
||||
X_SEND_REPLY_SIMPLE(client, rep);
|
||||
X_SEND_REPLY_SIMPLE(client, reply);
|
||||
return Success;
|
||||
}
|
||||
|
||||
@@ -994,16 +994,16 @@ ProcShapeGetRectangles(ClientPtr client)
|
||||
if (rpcbuf.error) /* buffer already cleared */
|
||||
return BadAlloc;
|
||||
|
||||
xShapeGetRectanglesReply rep = {
|
||||
xShapeGetRectanglesReply reply = {
|
||||
.ordering = YXBanded,
|
||||
.nrects = nrects
|
||||
};
|
||||
|
||||
if (client->swapped) {
|
||||
swapl(&rep.nrects);
|
||||
swapl(&reply.nrects);
|
||||
}
|
||||
|
||||
X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
|
||||
X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
|
||||
return Success;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user