1 files changed, 5 insertions, 10 deletions
diff --git a/programs/Xserver/Xi/chgprop.c b/programs/Xserver/Xi/chgprop.c
index e8291314c..4b2b8917f 100644
--- a/programs/Xserver/Xi/chgprop.c
+++ b/programs/Xserver/Xi/chgprop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.4tsi Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -78,21 +78,16 @@ int
 SProcXChangeDeviceDontPropagateList(client)
     register ClientPtr client;
     {
-    register char n;
-    register long *p;
-    register int i;
+    char n;
 
     REQUEST(xChangeDeviceDontPropagateListReq);
     swaps(&stuff->length, n);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
     swapl(&stuff->window, n);
     swaps(&stuff->count, n);
-    p = (long *) &stuff[1];
-    for (i=0; i<stuff->count; i++)
-        {
-        swapl(p, n);
-	p++;
-        }
+    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
+		       stuff->count * sizeof(CARD32));
+    SwapLongs((CARD32 *)(&stuff[1]), stuff->count);
     return(ProcXChangeDeviceDontPropagateList(client));
     }