[PATCH libXi 2/3] Change size += to size = in XGetDeviceControl
Peter Hutterer
peter.hutterer at who-t.net
Mon May 27 22:52:33 PDT 2013
size += blah is technically correct but it implies that we're looping or
otherwise incrementing the size. Which we don't, it's only ever set once.
Change this to avoid reviewer confusion.
Reported-by: Dave "color-me-confused" Airlie <airlied at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/XGetDCtl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 51ed0ae..b576aa5 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -122,34 +122,34 @@ XGetDeviceControl(
val_size = 3 * sizeof(int) * r->num_valuators;
if ((sizeof(xDeviceResolutionState) + val_size) > nbytes)
goto out;
- size += sizeof(XDeviceResolutionState) + val_size;
+ size = sizeof(XDeviceResolutionState) + val_size;
break;
}
case DEVICE_ABS_CALIB:
{
if (sizeof(xDeviceAbsCalibState) > nbytes)
goto out;
- size += sizeof(XDeviceAbsCalibState);
+ size = sizeof(XDeviceAbsCalibState);
break;
}
case DEVICE_ABS_AREA:
{
if (sizeof(xDeviceAbsAreaState) > nbytes)
goto out;
- size += sizeof(XDeviceAbsAreaState);
+ size = sizeof(XDeviceAbsAreaState);
break;
}
case DEVICE_CORE:
{
if (sizeof(xDeviceCoreState) > nbytes)
goto out;
- size += sizeof(XDeviceCoreState);
+ size = sizeof(XDeviceCoreState);
break;
}
default:
if (d->length > nbytes)
goto out;
- size += d->length;
+ size = d->length;
break;
}
--
1.8.1.4
More information about the xorg-devel
mailing list