From 12572f73d535a786f85b1d8f27715df960dbfd0d Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 26 Nov 2025 13:24:10 +0000 Subject: [PATCH] Consistently use IsSpace()/IsDigit() instead of isspace()/isdigit() in shell.c.in to squelch warnings on Cygwin. From Jan Nijtmans. FossilOrigin-Name: aa9d7365bb8d8a9d44388dc89dea09428d7cea2f9fba482cb56980b51b16b143 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 3d6f405e7b..28751dfcca 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\ssha1()\sextension\sfunction\sso\sthat\sit\sreturns\sactual\sTEXT\sinstead\nof\sa\sBLOB\scontaining\sthe\sUTF-8\sTEXT.\n[forum:/forumpost/d15eefea7c|Forum\spost\sd15eefea7c] -D 2025-11-26T11:19:11.232 +C Consistently\suse\sIsSpace()/IsDigit()\sinstead\sof\sisspace()/isdigit()\sin\sshell.c.in\sto\ssquelch\swarnings\son\sCygwin.\sFrom\sJan\sNijtmans. +D 2025-11-26T13:24:10.634 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 6a509cddd815d64f6141e539fff633a518a393772a44dffb4490f7fc3f0d83a9 -F src/shell.c.in 721bcbef2521ca6712e73dda8e07628b56798a5eae903be3048100ad9ad926fc +F src/shell.c.in 990817862286db8f05d2274c20a730d27218c7bb1aa79da3c7c796a3d5f137b2 F src/sqlite.h.in f1363321ca55cc2feaa289e9fe6dfb08102a28c54edf005564711a2348b06eef F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998 @@ -2180,8 +2180,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 71b916d4de7a4611f6ada597bfd58b59cab18e3a732de17c92b7346ecff31c04 -R 8a342f5298ac043d301d47c9e035df54 -U drh -Z 1832047028ab673aab528eafb2d4984c +P 6f806656a3f5ce9a79b18be057d880faca506f66cd4de4b5d77393c266cfb6d2 +R df9e0ffa0530200852ab2bf279e36a09 +U stephan +Z 278b344f58491eb0b06597e45571cc95 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 09f019b6e8..6b443a94b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f806656a3f5ce9a79b18be057d880faca506f66cd4de4b5d77393c266cfb6d2 +aa9d7365bb8d8a9d44388dc89dea09428d7cea2f9fba482cb56980b51b16b143 diff --git a/src/shell.c.in b/src/shell.c.in index 4f6a03eb19..ca76c40652 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -8014,12 +8014,12 @@ static int dotCmdMode(ShellState *p){ ** specify, so strlen(zW) bytes should be plenty of space to hold the ** result. */ aWidth = malloc( strlen(zW) ); - while( isspace(zW[0]) ) zW++; + while( IsSpace(zW[0]) ) zW++; while( zW[0] ){ int w = 0; int nDigit = 0; - k = zW[0]=='-' && isdigit(zW[1]); - while( isdigit(zW[k]) ){ + k = zW[0]=='-' && IsDigit(zW[1]); + while( IsDigit(zW[k]) ){ w = w*10 + zW[k] - '0'; if( w>QRF_MAX_WIDTH ){ dotCmdError(p,i+1,"width too big", @@ -8040,7 +8040,7 @@ static int dotCmdMode(ShellState *p){ aWidth[nWidth++] = w; zW += k; if( zW[0]==',' ) zW++; - while( isspace(zW[0]) ) zW++; + while( IsSpace(zW[0]) ) zW++; } free(p->mode.spec.aWidth); p->mode.spec.aWidth = aWidth; -- 2.47.3