On 4 October 2011 17:18, Daniel Stone <[email protected]> wrote: > Hi, > > On 4 October 2011 16:00, Michal Suchanek <[email protected]> wrote: >> On 4 October 2011 16:57, Matt Turner <[email protected]> wrote: >>> On Tue, Oct 4, 2011 at 2:55 PM, Michal Suchanek <[email protected]> wrote: >>>> On 4 October 2011 16:51, Matt Turner <[email protected]> wrote: >>>>> On Tue, Oct 4, 2011 at 2:33 PM, Michal Suchanek <[email protected]> >>>>> wrote: >>>>>> BTW it adds a warning about stuff variable being unused - probably >>>>>> defined in one of the macros. >>>>> >>>>> It's because the swap macros stopped taking a second argument. >>>> >>>> No, that would be the 'n' variable which you patched out already. >>> >>> Then I have no idea what you're talking about. >>> >> ../../Xext/xselinux_ext.c: In function ‘SProcSELinuxQueryVersion’: >> ../../Xext/xselinux_ext.c:529:5: warning: unused variable ‘stuff’ >> [-Wunused-variable] > > 'stuff' is the request variable generated by the REQUEST_* macros > (stupid name, I know). Since SProcSELinuxQueryVersion no longer > touches the macro, you can just delete the REQUEST_* macro and make it > simply return ProcSELinuxQueryVersion(client). > Yes, removing that also fixes the warning.
Attaching updated patch. Thanks Michal
From e0628cee60f9de96f4f229bc9e618113c532251c Mon Sep 17 00:00:00 2001 From: Matt Turner <[email protected]> Date: Tue, 4 Oct 2011 10:01:50 -0400 Subject: [PATCH] Fix xselinux after swap change Signed-off-by: Matt Turner <[email protected]> --- Xext/xselinux_ext.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) Index: xserver/Xext/xselinux_ext.c =================================================================== --- xserver.orig/Xext/xselinux_ext.c 2011-10-04 17:16:29.000000000 +0200 +++ xserver/Xext/xselinux_ext.c 2011-10-04 18:05:29.000000000 +0200 @@ -337,7 +337,7 @@ SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items, int size, int count) { - int rc, k, n, pos = 0; + int rc, k, pos = 0; SELinuxListItemsReply rep; CARD32 *buf; @@ -526,11 +526,7 @@ static int SProcSELinuxQueryVersion(ClientPtr client) { - REQUEST(SELinuxQueryVersionReq); - REQUEST_SIZE_MATCH(SELinuxQueryVersionReq); - swaps(&stuff->client_major); - swaps(&stuff->client_minor); return ProcSELinuxQueryVersion(client); }
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
