From: mistachkin Date: Tue, 12 Oct 2021 02:17:39 +0000 (+0000) Subject: Fix harmless compiler warnings in the debug build for MSVC. X-Git-Tag: version-3.37.0~136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77978a64f4b2ff33fa5255db88325759968cb1e9;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings in the debug build for MSVC. FossilOrigin-Name: 1ceb73f316ddc736aebd1e82ef3a0d9c173d025ac5b7fcfbde0a65a0eeb60a4b --- diff --git a/manifest b/manifest index 1644eb92a8..ee6f0b6845 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fail\sa\sschema\sparse\sif\sa\svirtual\stable\sor\sview\shas\sa\spositive\sinteger\nrootpage. -D 2021-10-11T15:54:05.911 +C Fix\sharmless\scompiler\swarnings\sin\sthe\sdebug\sbuild\sfor\sMSVC. +D 2021-10-12T02:17:39.440 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -517,7 +517,7 @@ F src/main.c d375bb6f761b3fa2cd2c1afaa5d4b282c7128a2c4d2fe7da6294fe8eaca9fa1a F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de -F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb +F src/mem2.c a6b4c1b29bfaaf6ac87628643cc10ab11f16a9b8a5b5b75f0ba8142adbbfa3e7 F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944 F src/memdb.c cd8cf3ee965db4a4ab4b5423b49a4ef810490b8ba828911e523325f2cce3ed1a @@ -554,7 +554,7 @@ F src/shell.c.in ac685e63c506fb2e39375c83347c88bff84dc48fa5d6a59f508d7d67951693a F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510 -F src/sqliteInt.h ef4da7ea99a18dd8975636e050b5eddc5576b55da127a8c7a80983c3ee608d25 +F src/sqliteInt.h 642c17df9e5a3517db452ac73a2b953143449a8bc2f6570c60de455a89a8571c F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -1928,7 +1928,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 6189b7809d774bf697d14e27a4bd961df5c318d261dce97db7801ce83f12c59a -R 9cb4b9fb9bb00a6c6989d7c18493c0e3 -U drh -Z a0f3b0022c1e0519582697c7b0ed76b0 +P 02656760406add06303afc94eaf9f2be021cbdbc7ac1ca79b139a7d2de9c0dc5 +R 6eba3cbabf6ac2a73d7123c6e6c0014f +U mistachkin +Z d951710d1eaf82a2a4e925900c6cc2a4 diff --git a/manifest.uuid b/manifest.uuid index a137e5c2da..ebe8d13d0c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -02656760406add06303afc94eaf9f2be021cbdbc7ac1ca79b139a7d2de9c0dc5 \ No newline at end of file +1ceb73f316ddc736aebd1e82ef3a0d9c173d025ac5b7fcfbde0a65a0eeb60a4b \ No newline at end of file diff --git a/src/mem2.c b/src/mem2.c index ac031508c2..4ecbd8005c 100644 --- a/src/mem2.c +++ b/src/mem2.c @@ -396,7 +396,7 @@ void sqlite3MemdebugSetType(void *p, u8 eType){ ** ** assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); */ -int sqlite3MemdebugHasType(void *p, u8 eType){ +int sqlite3MemdebugHasType(const void *p, u8 eType){ int rc = 1; if( p && sqlite3GlobalConfig.m.xFree==sqlite3MemFree ){ struct MemBlockHdr *pHdr; @@ -418,7 +418,7 @@ int sqlite3MemdebugHasType(void *p, u8 eType){ ** ** assert( sqlite3MemdebugNoType(p, MEMTYPE_LOOKASIDE) ); */ -int sqlite3MemdebugNoType(void *p, u8 eType){ +int sqlite3MemdebugNoType(const void *p, u8 eType){ int rc = 1; if( p && sqlite3GlobalConfig.m.xFree==sqlite3MemFree ){ struct MemBlockHdr *pHdr; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index d1885ebc6c..dbf994d53f 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -5257,8 +5257,8 @@ SQLITE_API SQLITE_EXTERN void (SQLITE_CDECL *sqlite3IoTrace)(const char*,...); */ #ifdef SQLITE_MEMDEBUG void sqlite3MemdebugSetType(void*,u8); - int sqlite3MemdebugHasType(void*,u8); - int sqlite3MemdebugNoType(void*,u8); + int sqlite3MemdebugHasType(const void*,u8); + int sqlite3MemdebugNoType(const void*,u8); #else # define sqlite3MemdebugSetType(X,Y) /* no-op */ # define sqlite3MemdebugHasType(X,Y) 1