../src/xf86Wacom.c:511:16: warning: variable 'i' may be uninitialized when used
here [-Wconditional-uninitialized]
pInfo->name, i + 1, wait);
xsetwacom.c:2308:36: warning: variable 'x' may be uninitialized when used here
[-Wconditional-uninitialized]
return set_output_area(dpy, dev, x, y, width, height);
^
xsetwacom.c:2308:39: warning: variable 'y' may be uninitialized when used here
[-Wconditional-uninitialized]
return set_output_area(dpy, dev, x, y, width, height);
^
xsetwacom.c:2308:42: warning: variable 'width' may be uninitialized when used
here [-Wconditional-uninitialized]
return set_output_area(dpy, dev, x, y, width, height);
^~~~~
xsetwacom.c:2308:49: warning: variable 'height' may be uninitialized when used
here [-Wconditional-uninitialized]
return set_output_area(dpy, dev, x, y, width, height);
^~~~~~
isdv4-serial-inputattach.c:107:6: warning: variable 'attr_id' may be
uninitialized when used here [-Wconditional-uninitialized]
if (attr_id && sscanf(attr_id, "WACf%x", &id) == 1 && id >= 0x8)
^~~~~~~
isdv4-serial-inputattach.c:179:22: warning: variable 'baudrate' may be
uninitialized when used here [-Wconditional-uninitialized]
set_serial_attr(fd, baudrate);
^~~~~~~~
Signed-off-by: Jason Gerecke <[email protected]>
---
src/xf86Wacom.c | 2 +-
tools/isdv4-serial-inputattach.c | 6 +++---
tools/xsetwacom.c | 18 ++++++------------
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index de0438f..a04f936 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -480,7 +480,7 @@ Bool wcmIsWacomDevice (char* fname)
char *wcmEventAutoDevProbe (InputInfoPtr pInfo)
{
/* We are trying to find the right eventX device */
- int i, wait = 0;
+ int i = 0, wait = 0;
const int max_wait = 2000;
/* If device is not available after Resume, wait some ms */
diff --git a/tools/isdv4-serial-inputattach.c b/tools/isdv4-serial-inputattach.c
index 1bddaf8..b8575e2 100644
--- a/tools/isdv4-serial-inputattach.c
+++ b/tools/isdv4-serial-inputattach.c
@@ -85,7 +85,7 @@ int get_baud_rate(int fd)
int id;
struct udev *udev;
struct udev_device *device, *parent;
- const char *attr_id;
+ const char *attr_id = NULL;
fstat(fd, &st);
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
int sensor_id;
char *filename;
int fd, rc = 1;
- int baudrate;
+ int baudrate = 0;
int have_baudrate = 0;
int c, optidx = 0;
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
case 'b':
have_baudrate = 1;
baudrate = atoi(optarg);
- if (baudrate == 0) {
+ if (baudrate <= 0) {
usage();
return 1;
}
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index 304f9fa..1f6148f 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -2267,14 +2267,14 @@ static Bool set_output_area(Display *dpy, XDevice *dev,
*/
static Bool set_output_xrandr(Display *dpy, XDevice *dev, char *output_name)
{
- int i, found = 0;
+ int i, success = 0;
int x, y, width, height;
XRRScreenResources *res;
XRROutputInfo *output_info;
XRRCrtcInfo *crtc_info;
res = XRRGetScreenResources(dpy, DefaultRootWindow(dpy));
- for (i = 0; i < res->noutput && !found; i++)
+ for (i = 0; i < res->noutput; i++)
{
output_info = XRRGetOutputInfo(dpy, res, res->outputs[i]);
@@ -2295,24 +2295,18 @@ static Bool set_output_xrandr(Display *dpy, XDevice
*dev, char *output_name)
if (strcmp(output_info->name, output_name) == 0)
{
- found = 1;
+ TRACE("Setting CRTC %s\n", output_name);
+ success = set_output_area(dpy, dev, x, y, width,
height);
break;
}
}
XRRFreeScreenResources(res);
- /* crtc holds our screen info, need to compare to actual screen size */
- if (found)
- {
- TRACE("Setting CRTC %s\n", output_name);
- return set_output_area(dpy, dev, x, y, width, height);
- } else
- {
+ if (!success)
printf("Unable to find output '%s'. "
"Output may not be connected.\n", output_name);
- return False;
- }
+ return success;
}
/**
--
2.1.0
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
