From: drh <> Date: Thu, 21 Apr 2022 19:14:23 +0000 (+0000) Subject: Fix harmless compiler warnings in the CLI. X-Git-Tag: version-3.39.0~208 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e9a56f70f5f361a2ca30efdc15f073318c42254;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings in the CLI. FossilOrigin-Name: dfd2100bc4f316825fd199b347849d1a2b941837f9eedcf36f3c3d280692b991 --- diff --git a/manifest b/manifest index 3a1dd36072..ec569dd78e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C For\sCLI,\sfix\show\scolumnar\smode\sfills\sin\sempty\sportions\sof\swrapped\srow\soutputs. -D 2022-04-20T22:41:10.920 +C Fix\sharmless\scompiler\swarnings\sin\sthe\sCLI. +D 2022-04-21T19:14:23.704 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -553,7 +553,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 2df3b525acb48c4e005556771164cefca301e32aad14ffc51f5c9480ea04ff38 -F src/shell.c.in b3250485b9b6c926c2576e6e89b23574b6d59fcd04ea9bc63131a13fb4243628 +F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc35 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e @@ -1945,8 +1945,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 9430ead7ba433cbfce99f4f364a0c08499230e3a04f167326b0f131f098ffa09 -R 6ef848a57b0ae2fb87aa59c0dc6c64a7 -U larrybr -Z 0a5dc40772a2c0441c803c4b4812274a +P 77aed89192bdbad819ac17bf5d08728278a9b8cbbbef1d805df230caff79b417 +R 9aaafc06672426af81fcdc005d19ebe8 +U drh +Z 3b2a5cb05d697a79a788f6022f5820da # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e8362d9747..3e212c427a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -77aed89192bdbad819ac17bf5d08728278a9b8cbbbef1d805df230caff79b417 \ No newline at end of file +dfd2100bc4f316825fd199b347849d1a2b941837f9eedcf36f3c3d280692b991 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index e6f4a2c95b..95a32f5247 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -3413,14 +3413,14 @@ static void exec_prepared_stmt_columnar( if( wx<0 ) wx = -wx; if( useNextLine ){ uz = azNextLine[i]; - if( uz==0 ) uz = (char*)zEmpty; + if( uz==0 ) uz = (u8*)zEmpty; }else if( p->cmOpts.bQuote ){ sqlite3_free(azQuoted[i]); azQuoted[i] = quoted_column(pStmt,i); uz = (const unsigned char*)azQuoted[i]; }else{ uz = (const unsigned char*)sqlite3_column_text(pStmt,i); - if( uz==0 ) uz = (char*)zShowNull; + if( uz==0 ) uz = (u8*)zShowNull; } azData[nRow*nColumn + i] = translateForDisplayAndDup(uz, &azNextLine[i], wx, bw);