summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-03-13 11:05:03 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-03-16 07:57:26 +1000
commit74433f788acf41a43da54269eb1b73c407f3ceba (patch)
tree54a78d82fc6ea5ca171c591cdd862ddd6dffbbc4
parentfdc33809de2751c164183df2310a71732be579f3 (diff)
Always check for a return value on creating a property
Mostly to make static analyzers happy Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 360bbb8..da25b56 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2828,6 +2828,9 @@ EvdevInitProperty(DeviceIntPtr dev)
strlen(XI_PROP_VIRTUAL_DEVICE), TRUE);
rc = XIChangeDeviceProperty(dev, prop_virtual, XA_INTEGER, 8,
PropModeReplace, 1, &virtual, FALSE);
+ if (rc != Success)
+ return;
+
XISetDevicePropertyDeletable(dev, prop_virtual, FALSE);
}
@@ -2900,8 +2903,11 @@ EvdevInitProperty(DeviceIntPtr dev)
}
EvdevInitAxesLabels(pEvdev, mode, num_axes, atoms);
- XIChangeDeviceProperty(dev, prop_axis_label, XA_ATOM, 32,
- PropModeReplace, num_axes, atoms, FALSE);
+ rc = XIChangeDeviceProperty(dev, prop_axis_label, XA_ATOM, 32,
+ PropModeReplace, num_axes, atoms, FALSE);
+ if (rc != Success)
+ return;
+
XISetDevicePropertyDeletable(dev, prop_axis_label, FALSE);
}
/* Button labelling */
@@ -2909,8 +2915,11 @@ EvdevInitProperty(DeviceIntPtr dev)
{
Atom atoms[EVDEV_MAXBUTTONS];
EvdevInitButtonLabels(pEvdev, EVDEV_MAXBUTTONS, atoms);
- XIChangeDeviceProperty(dev, prop_btn_label, XA_ATOM, 32,
- PropModeReplace, pEvdev->num_buttons, atoms, FALSE);
+ rc = XIChangeDeviceProperty(dev, prop_btn_label, XA_ATOM, 32,
+ PropModeReplace, pEvdev->num_buttons, atoms, FALSE);
+ if (rc != Success)
+ return;
+
XISetDevicePropertyDeletable(dev, prop_btn_label, FALSE);
}
@@ -2922,8 +2931,11 @@ EvdevInitProperty(DeviceIntPtr dev)
};
prop_scroll_dist = MakeAtom(EVDEV_PROP_SCROLL_DISTANCE,
strlen(EVDEV_PROP_SCROLL_DISTANCE), TRUE);
- XIChangeDeviceProperty(dev, prop_scroll_dist, XA_INTEGER, 32,
- PropModeReplace, 3, smooth_scroll_values, FALSE);
+ rc = XIChangeDeviceProperty(dev, prop_scroll_dist, XA_INTEGER, 32,
+ PropModeReplace, 3, smooth_scroll_values, FALSE);
+ if (rc != Success)
+ return;
+
XISetDevicePropertyDeletable(dev, prop_scroll_dist, FALSE);
}