Fix three harmless declaration-after-statement warnings in the new CLI code.

FossilOrigin-Name: b65b29656c835db22557733f4dcfe906bf21a7a3c36266cbbc7e3277f029b901

diff --git a/manifest b/manifest
index 9450cc2f268c981854915e8ba96288c54561ce95..51bf39f6dd0d5ded6da6067fc0ef4b9ff6142103 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\smake\sthe\sgenerated\sfile\s"shell.c"\sread-only.\s\sThis\sturns\nout\sto\sbe\sannoying\sin\sgeneral,\sand\sespecially\sannoying\son\smacs.
-D 2025-11-18T19:11:21.605
+C Fix\sthree\sharmless\sdeclaration-after-statement\swarnings\sin\sthe\snew\sCLI\scode.
+D 2025-11-19T19:37:28.777
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -734,7 +734,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a
-F src/shell.c.in 4fdceb103ba8761bf3d68108c3a6e6499be913a2490a7c384ee79ee547a9517c
+F src/shell.c.in b5de4197a021ed3157c243bdb320fce7d388f68fd45ac967e30e61092aa0cc40
 F src/sqlite.h.in f1363321ca55cc2feaa289e9fe6dfb08102a28c54edf005564711a2348b06eef
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2175,8 +2175,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 7e460ffa5aae884807db9e7c8214d6d822d5d38ea406fe3b3eac04ac16f158fa
-R f9c4e45f38839ca1c261638da612b298
+P 6ab18d036a3e412ee01806a40f69aca2b77283bd5336df27597cc19d32e6e6f2
+R e3da078c2b7960eab0e64962daf9a98f
 U drh
-Z 3de148df391cc0000ff94c377d5776dd
+Z e7941ad5f7c0e9c526b337f263473567
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 97b57d24c21fe1ac7e5d3d645aad7ececac24b46..4ee77695bb276c4b03a046022a1811f8cae871a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6ab18d036a3e412ee01806a40f69aca2b77283bd5336df27597cc19d32e6e6f2
+b65b29656c835db22557733f4dcfe906bf21a7a3c36266cbbc7e3277f029b901

diff --git a/src/shell.c.in b/src/shell.c.in
index cc05e4c6568c418197fda4ac9fc3aa55c3159b36..9d6335477003bf227c5d937dff3f227ac624039a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1600,8 +1600,8 @@ static void modeSetStr(char **az, const char *zNew){
 static void modeChange(ShellState *p, unsigned char eMode){
   const ModeInfo *pI;
   if( eMode<ArraySize(aModeInfo) ){
-    pI = &aModeInfo[eMode];
     Mode *pM = &p->mode;
+    pI = &aModeInfo[eMode];
     pM->eMode = eMode;
     if( pI->eCSep ) modeSetStr(&pM->spec.zColumnSep, aModeStr[pI->eCSep]);
     if( pI->eRSep ) modeSetStr(&pM->spec.zRowSep, aModeStr[pI->eRSep]);
@@ -2101,34 +2101,37 @@ static void interrupt_handler(int NotUsed){
 /* Try to determine the screen width.  Use the default if unable.
 */
 int shellScreenWidth(void){
-  if( stdout_tty_width>0 ) return stdout_tty_width;
+  if( stdout_tty_width>0 ){
+    return stdout_tty_width;
+  }else{
 #if defined(TIOCGSIZE)
-  struct ttysize ts;
-  if( ioctl(STDIN_FILENO, TIOCGSIZE, &ts)>=0
-   || ioctl(STDOUT_FILENO, TIOCGSIZE, &ts)>=0
-   || ioctl(STDERR_FILENO, TIOCGSIZE, &ts)>=0
-  ){
-    return ts.ts_cols;
-  }
+    struct ttysize ts;
+    if( ioctl(STDIN_FILENO, TIOCGSIZE, &ts)>=0
+     || ioctl(STDOUT_FILENO, TIOCGSIZE, &ts)>=0
+     || ioctl(STDERR_FILENO, TIOCGSIZE, &ts)>=0
+    ){
+      return ts.ts_cols;
+    }
 #elif defined(TIOCGWINSZ)
-  struct winsize ws;
-  if( ioctl(STDIN_FILENO, TIOCGWINSZ, &ws)>=0
-   || ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws)>=0
-   || ioctl(STDERR_FILENO, TIOCGWINSZ, &ws)>=0
-  ){
-    return ws.ws_col;
-  }
+    struct winsize ws;
+    if( ioctl(STDIN_FILENO, TIOCGWINSZ, &ws)>=0
+     || ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws)>=0
+     || ioctl(STDERR_FILENO, TIOCGWINSZ, &ws)>=0
+    ){
+      return ws.ws_col;
+    }
 #elif defined(_WIN32)
-  CONSOLE_SCREEN_BUFFER_INFO csbi;
-  if( GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)
-   || GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &csbi)
-   || GetConsoleScreenBufferInfo(GetStdHandle(STD_INPUT_HANDLE), &csbi)
-  ){
-    return csbi.srWindow.Right - csbi.srWindow.Left + 1;
-  }
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    if( GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)
+     || GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &csbi)
+     || GetConsoleScreenBufferInfo(GetStdHandle(STD_INPUT_HANDLE), &csbi)
+    ){
+      return csbi.srWindow.Right - csbi.srWindow.Left + 1;
+    }
 #endif
 #define DEFAULT_SCREEN_WIDTH 80
-  return DEFAULT_SCREEN_WIDTH;
+    return DEFAULT_SCREEN_WIDTH;
+  }
 }
 
 #if (defined(_WIN32) || defined(WIN32)) && !defined(_WIN32_WCE)
@@ -9227,8 +9230,8 @@ static int do_meta_command(const char *zLine, ShellState *p){
     rc = shell_exec(&data,zSql,0);
     sqlite3_free(zSql);
     if( rc==SQLITE_OK ){
-      memset(hasStat, 0, sizeof(hasStat));
       sqlite3_stmt *pStmt;
+      memset(hasStat, 0, sizeof(hasStat));
       rc = sqlite3_prepare_v2(p->db,
                "SELECT substr(name,12,1) FROM sqlite_schema"
                " WHERE name GLOB 'sqlite_stat[134]'",