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

os: utils: fix char signess mismatch 

On NetBSD gives warning:

In file included from /usr/include/ctype.h:100,
                 from ../include/misc.h:174,
                 from ../os/utils.c:75:
../os/utils.c: In function ‘VerifyDisplayName’:
../os/utils.c:624:23: warning: array subscript has type ‘char’ [-Wchar-subscripts]
  624 |         if (!isdigit(d[i])) {
      |                       ^
../os/utils.c: In function ‘ProcessCommandLine’:
../os/utils.c:942:44: warning: array subscript has type ‘char’ [-Wchar-subscripts]
  942 |             if ((i + 1 < argc) && (isdigit(*argv[i + 1])))
      |                                            ^

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1455>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-02 17:28:03 +02:00 committed by Povilas Kanapickas
parent 9446ae487c
commit bb9953db3f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/utils.c
View File

@ -437,7 +437,7 @@ VerifyDisplayName(const char *d)
for digits, or exception of :0.0 and similar (two decimal points max) for digits, or exception of :0.0 and similar (two decimal points max)
*/ */
for (i = 0; i < strlen(d); i++) { for (i = 0; i < strlen(d); i++) {
if (!isdigit(d[i])) { if (!isdigit((unsigned char)d[i])) {
if (d[i] != '.' || period_found) if (d[i] != '.' || period_found)
return 0; return 0;
period_found = TRUE; period_found = TRUE;
@ -753,7 +753,7 @@ ProcessCommandLine(int argc, char *argv[])
else if (strcmp(argv[i], "-terminate") == 0) { else if (strcmp(argv[i], "-terminate") == 0) {
dispatchExceptionAtReset = DE_TERMINATE; dispatchExceptionAtReset = DE_TERMINATE;
terminateDelay = -1; terminateDelay = -1;
if ((i + 1 < argc) && (isdigit(*argv[i + 1]))) if ((i + 1 < argc) && (isdigit((unsigned char)*argv[i + 1])))
terminateDelay = atoi(argv[++i]); terminateDelay = atoi(argv[++i]);
terminateDelay = max(0, terminateDelay); terminateDelay = max(0, terminateDelay);
} }