diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-03 13:57:14 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-14 10:05:53 +1000 |
| commit | 7dd415aa6a3959f15276741db168ba264948ecfe (patch) | |
| tree | 84e5b697f073722936dc82f138255f71ef2153d4 /Xi/chgdctl.c | |
| parent | 912402fd71144bcee255141efe12a78abad39240 (diff) | |
| download | xserver-7dd415aa6a3959f15276741db168ba264948ecfe.tar.gz | |
Xi: use byte-counting macros instead of manual calculation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/chgdctl.c')
| -rw-r--r-- | Xi/chgdctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 89e5a2d93..901a0e419 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -142,7 +142,7 @@ ProcXChangeDeviceControl(ClientPtr client) REQUEST(xChangeDeviceControlReq); REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq); - len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2); + len = stuff->length - bytes_to_int32(sizeof(xChangeDeviceControlReq)); ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess); if (ret != Success) goto out; @@ -155,8 +155,8 @@ ProcXChangeDeviceControl(ClientPtr client) switch (stuff->control) { case DEVICE_RESOLUTION: r = (xDeviceResolutionCtl *) & stuff[1]; - if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) || - (len != (sizeof(xDeviceResolutionCtl) >> 2) + r->num_valuators)) { + if ((len < bytes_to_int32(sizeof(xDeviceResolutionCtl))) || + (len != bytes_to_int32(sizeof(xDeviceResolutionCtl)) + r->num_valuators)) { ret = BadLength; goto out; } |