summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-12-19 12:21:31 -0800
committerKeith Packard <keithp@keithp.com>2012-12-19 12:22:03 -0800
commit0eb1559eb29d11e63c2b33e317590a88d86fe313 (patch)
tree6d5956d8dd1ad6f87cd3b410c6a6049c1981004a /Xi
parent386e4d76baaffe226d2d561ff936509454eb0ac2 (diff)
parentea1d76d1b68c7cbcedcaa1f967c5027e0cc1c7a2 (diff)
Merge remote-tracking branch 'yselkowitz/master'
I checked this patch with diff -w to check that it only affected whitespace.
Diffstat (limited to 'Xi')
-rw-r--r--Xi/extinit.c6
-rw-r--r--Xi/gtmotion.c2
-rw-r--r--Xi/xichangehierarchy.c2
-rw-r--r--Xi/xiquerydevice.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 73b084cd9..619d0e468 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -649,7 +649,7 @@ SDeviceChangedEvent(xXIDeviceChangedEvent * from, xXIDeviceChangedEvent * to)
*to = *from;
memcpy(&to[1], &from[1], from->length * 4);
- any = (xXIAnyInfo *) & to[1];
+ any = (xXIAnyInfo *) &to[1];
for (i = 0; i < to->num_classes; i++) {
int length = any->length;
@@ -657,7 +657,7 @@ SDeviceChangedEvent(xXIDeviceChangedEvent * from, xXIDeviceChangedEvent * to)
case KeyClass:
{
xXIKeyInfo *ki = (xXIKeyInfo *) any;
- uint32_t *key = (uint32_t *) & ki[1];
+ uint32_t *key = (uint32_t *) &ki[1];
for (j = 0; j < ki->num_keycodes; j++, key++)
swapl(key);
@@ -768,7 +768,7 @@ SDeviceHierarchyEvent(xXIHierarchyEvent * from, xXIHierarchyEvent * to)
swapl(&to->flags);
swaps(&to->num_info);
- info = (xXIHierarchyInfo *) & to[1];
+ info = (xXIHierarchyInfo *) &to[1];
for (i = 0; i < from->num_info; i++) {
swaps(&info->deviceid);
swaps(&info->attachment);
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 4642b194a..cde5351a6 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -131,7 +131,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
num_events = v->numMotionEvents;
if (num_events) {
size = sizeof(Time) + (axes * sizeof(INT32));
- rep.nEvents = GetMotionHistory(dev, (xTimecoord **) & coords, /* XXX */
+ rep.nEvents = GetMotionHistory(dev, (xTimecoord **) &coords, /* XXX */
start.milliseconds, stop.milliseconds,
(ScreenPtr) NULL, FALSE);
}
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index 0184eb29a..e2f4b8a0a 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -80,7 +80,7 @@ XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
ev->flags = 0;
ev->num_info = inputInfo.numDevices;
- info = (xXIHierarchyInfo *) & ev[1];
+ info = (xXIHierarchyInfo *) &ev[1];
for (dev = inputInfo.devices; dev; dev = dev->next) {
info->deviceid = dev->id;
info->enabled = dev->enabled;
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index 85c1dd81d..4e544f0f5 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -304,7 +304,7 @@ ListKeyInfo(DeviceIntPtr dev, xXIKeyInfo * info)
info->length = sizeof(xXIKeyInfo) / 4 + info->num_keycodes;
info->sourceid = dev->key->sourceid;
- kc = (uint32_t *) & info[1];
+ kc = (uint32_t *) &info[1];
for (i = xkb->min_key_code; i <= xkb->max_key_code; i++, kc++)
*kc = i;
@@ -321,7 +321,7 @@ SwapKeyInfo(DeviceIntPtr dev, xXIKeyInfo * info)
swaps(&info->length);
swaps(&info->sourceid);
- for (i = 0, key = (uint32_t *) & info[1]; i < info->num_keycodes;
+ for (i = 0, key = (uint32_t *) &info[1]; i < info->num_keycodes;
i++, key++)
swapl(key);