(submit/fix-char-signedness) xkb: xkbInit: fix char signess mismatch
On NetBSD gives warning: ../xkb/xkbInit.c: In function ‘XkbProcessArguments’: ../xkb/xkbInit.c:778:57: warning: array subscript has type ‘char’ [-Wchar-subscripts] 778 | if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) { | ^ ../xkb/xkbInit.c:782:61: warning: array subscript has type ‘char’ [-Wchar-subscripts] 782 | if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) { | ^ ../xkb/xkbInit.c:792:61: warning: array subscript has type ‘char’ [-Wchar-subscripts] 792 | if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) { | ^ ../xkb/xkbInit.c:799:61: warning: array subscript has type ‘char’ [-Wchar-subscripts] 799 | if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) { | ^
This commit is contained in:
parent
8eced6ccc7
commit
d156fb6d88
|
@ -769,11 +769,11 @@ XkbProcessArguments(int argc, char *argv[], int i)
|
||||||
else {
|
else {
|
||||||
XkbWantAccessX = 1;
|
XkbWantAccessX = 1;
|
||||||
|
|
||||||
if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
|
if (((i + 1) < argc) && (isdigit((unsigned char)argv[i + 1][0]))) {
|
||||||
XkbDfltAccessXTimeout = atoi(argv[++i]);
|
XkbDfltAccessXTimeout = atoi(argv[++i]);
|
||||||
j++;
|
j++;
|
||||||
|
|
||||||
if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
|
if (((i + 1) < argc) && (isdigit((unsigned char)argv[i + 1][0]))) {
|
||||||
/*
|
/*
|
||||||
* presumption that the reasonably useful range of
|
* presumption that the reasonably useful range of
|
||||||
* values fits in 0..MAXINT since SunOS 4 doesn't
|
* values fits in 0..MAXINT since SunOS 4 doesn't
|
||||||
|
@ -783,14 +783,14 @@ XkbProcessArguments(int argc, char *argv[], int i)
|
||||||
strtol(argv[++i], NULL, 16);
|
strtol(argv[++i], NULL, 16);
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
|
if (((i + 1) < argc) && (isdigit((unsigned char)argv[i + 1][0]))) {
|
||||||
if (argv[++i][0] == '1')
|
if (argv[++i][0] == '1')
|
||||||
XkbDfltAccessXFeedback = XkbAccessXFeedbackMask;
|
XkbDfltAccessXFeedback = XkbAccessXFeedbackMask;
|
||||||
else
|
else
|
||||||
XkbDfltAccessXFeedback = 0;
|
XkbDfltAccessXFeedback = 0;
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
|
if (((i + 1) < argc) && (isdigit((unsigned char)argv[i + 1][0]))) {
|
||||||
XkbDfltAccessXOptions = (unsigned short)
|
XkbDfltAccessXOptions = (unsigned short)
|
||||||
strtol(argv[++i], NULL, 16);
|
strtol(argv[++i], NULL, 16);
|
||||||
j++;
|
j++;
|
||||||
|
|
Loading…
Reference in New Issue