summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2022-02-04 11:31:16 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2022-02-07 13:29:29 +1000
commit16b1c0b5e5cff6ae6f81638e95b0f83d3a1a4b5f (patch)
tree6f572bc47587a6f3c2c4466f4b22999b663c659d
parentae84ebd96524524aa214ea9fa1bbc5548b4eb8f8 (diff)
downloadxf86-input-wacom-16b1c0b5e5cff6ae6f81638e95b0f83d3a1a4b5f.tar.gz
xsetwacom: shut up two compiler warnings
There's more, but let's silence some of them at least Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--tools/xsetwacom.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index d10275f..6ccd7c2 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -2230,7 +2230,7 @@ static Bool get_mapped_area(Display *dpy, XDevice *dev, int *width, int *height,
{
Atom matrix_prop = XInternAtom(dpy, "Coordinate Transformation Matrix", True);
Atom type;
- int format, i;
+ int format;
unsigned long nitems, bytes_after;
unsigned long *data;
float matrix[9];
@@ -2260,7 +2260,7 @@ static Bool get_mapped_area(Display *dpy, XDevice *dev, int *width, int *height,
/* XI1 stores 32 bit properties (including float) as long,
* regardless of architecture */
- for (i = 0; i < ARRAY_SIZE(matrix); i++)
+ for (size_t i = 0; i < ARRAY_SIZE(matrix); i++)
matrix[i] = *(float*)(&data[i]);
TRACE("Current transformation matrix:\n");
@@ -2301,7 +2301,6 @@ static Bool _set_matrix_prop(Display *dpy, XDevice *dev, const float fmatrix[9])
unsigned long nitems, bytes_after;
float *data;
long matrix[9] = {0};
- int i;
if (!matrix_prop)
{
@@ -2311,7 +2310,7 @@ static Bool _set_matrix_prop(Display *dpy, XDevice *dev, const float fmatrix[9])
/* XI1 expects 32 bit properties (including float) as long,
* regardless of architecture */
- for (i = 0; i < ARRAY_SIZE(matrix); i++)
+ for (size_t i = 0; i < ARRAY_SIZE(matrix); i++)
*(float*)(matrix + i) = fmatrix[i];
XGetDeviceProperty(dpy, dev, matrix_prop, 0, 9, False,