if (*s >= '0' && *s <='9')
add = *s-'0';
else if (*s >= 'A' && *s <='F')
- add = *s-'A';
+ add = *s-'A'+10;
else if (*s >= 'a' && *s <='f')
- add = *s-'a';
+ add = *s-'a'+10;
else
break;
result *= 16;
result += add;
+ ++s;
}
return result;
}
default:
g_assert_not_reached(); /* unhandled size */
}
- *num = ret_items;
- ret = TRUE;
}
+ *num = ret_items;
+ ret = TRUE;
XFree(xdata);
}
return ret;
}
}
if (found)
- g_print("%s(%s) = %s\n", name, type, val);
+ g_print("%s(%s) = %s\n", name, type, (val ? val : ""));
g_free(val);
}
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--help")) {
- return fail(0);
+ return fail(NULL);
}
else if (!strcmp(argv[i], "--root"))
root = TRUE;
else if (!strcmp(argv[i], "--id")) {
if (++i == argc)
- return fail(0);
+ return fail(NULL);
if (argv[i][0] == '0' && argv[i][1] == 'x') {
/* hex */
userid = parse_hex(argv[i]+2);
/* decimal */
userid = atoi(argv[i]);
}
- break;
+ if (!userid)
+ return fail("Unable to parse argument to --id.");
}
else if (!strcmp(argv[i], "--display")) {
if (++i == argc)
- return fail(0);
+ return fail(NULL);
dname = argv[i];
}
else if (*argv[i] != '-')
break;
}
}
+ id = find_client(d, userid);
}
-
- id = find_client(d, userid);
+ else
+ id = userid; /* they picked this one */
if (id == None)
return fail("Unable to find window with the requested ID");