frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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:
Enrico Weigelt, metux IT consult 2024-04-02 17:32:56 +02:00
parent 10cbefdf85
commit 1fd975d4f6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xkb/xkbInit.c
View File

@ -778,11 +778,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
@ -792,14 +792,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++;