From: drh <> Date: Wed, 8 Jun 2022 18:29:23 +0000 (+0000) Subject: Move an #ifdef in shell.c to avoid a harmless "unused function" X-Git-Tag: version-3.39.0~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=048366800703333b52defea747b902f67aad931f;p=thirdparty%2Fsqlite.git Move an #ifdef in shell.c to avoid a harmless "unused function" compiler warning. FossilOrigin-Name: 5abb5ef500f52c52dac33e54d824cf89481fec1643c27943f34f0ca4560a7e00 --- diff --git a/manifest b/manifest index 94b2fc5d6d..810121af56 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\szeroing\sthe\svalue\sreturned\sby\ssqlite3_changes()\swhen\sa\sDML\sstatement\sis\sautomatically\sreprepared\sin\ssqlite3_step(). -D 2022-06-08T18:20:36.188 +C Move\san\s#ifdef\sin\sshell.c\sto\savoid\sa\sharmless\s"unused\sfunction"\s\ncompiler\swarning. +D 2022-06-08T18:29:23.637 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -571,7 +571,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 5f2dfc578ee9cc313a32f5848b9d9ba7d8dab8095591ed746dcee4a271890508 -F src/shell.c.in 5d5f27f88c4661b2b6e6859890e9c7fe00eac9a628743a12c44632705fc38309 +F src/shell.c.in 08e59f1cb9d9b1180aba52861aaada0c95f6ddd210488719684e160a0724c806 F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d @@ -1976,8 +1976,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 8c9e2d6315fde014bd6e25a7fa58ba054f5328c8a56e9d3d1c2d069c025a1b03 -R b726c2868f8c5f923ae86ae3d88b5b1f -U dan -Z c862125e8b609e98c2c1bde6546f878f +P 09c8f9f1970cd5b369d98a2b38f0b04d44ed095cb0bda80f7968bb6be4e0263b +R 1dfc7c7d24e49c7701ee2b2304893786 +U drh +Z ac5a8d59f2f998b129bdd56d29189077 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8712a716b7..89d7cae017 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -09c8f9f1970cd5b369d98a2b38f0b04d44ed095cb0bda80f7968bb6be4e0263b \ No newline at end of file +5abb5ef500f52c52dac33e54d824cf89481fec1643c27943f34f0ca4560a7e00 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index c9593f8b5e..1d86e1eed6 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -5837,6 +5837,7 @@ static int db_int(sqlite3 *db, const char *zSql){ return res; } +#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) /* ** Convert a 2-byte or 4-byte big-endian integer into a native integer */ @@ -5847,7 +5848,6 @@ static unsigned int get4byteInt(unsigned char *a){ return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3]; } -#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) /* ** Implementation of the ".dbinfo" command. **