From: drh Date: Thu, 30 Apr 2015 12:31:49 +0000 (+0000) Subject: Fix signed/unsigned comparison compiler warnings. Add the X-Git-Tag: version-3.8.10~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a412b8be937d526fc927f4a451f1c33d8c4375d;p=thirdparty%2Fsqlite.git Fix signed/unsigned comparison compiler warnings. Add the SQLITE_OMIT_RANDOMNESS compile-time option to cause the PRNG to be seeded identically on every run, for testing purposes. FossilOrigin-Name: 93ce2bca701efc67aeb517c4d641bde71332e8a0 --- diff --git a/manifest b/manifest index 6c42d1d600..c8aba164d9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\ssqlite3_malloc64()\sin\splace\sof\ssqlite3_malloc()\sinternally. -D 2015-04-29T16:50:28.175 +C Fix\ssigned/unsigned\scomparison\scompiler\swarnings.\s\sAdd\sthe\nSQLITE_OMIT_RANDOMNESS\scompile-time\soption\sto\scause\sthe\sPRNG\sto\sbe\sseeded\nidentically\son\severy\srun,\sfor\stesting\spurposes. +D 2015-04-30T12:31:49.332 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e3268d234210842b4be0a6e2e1c5990999f1d9f4 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -194,7 +194,7 @@ F src/insert.c 8176ba5bad8fcef643558ca5708f33ed05a4035a F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 -F src/loadext.c 89176b67ce0c2833e6397c7623252968e57aed3f +F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271 F src/main.c af89a158aa7bd40f6edef527c7b78ef581d72886 F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 @@ -214,8 +214,8 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa -F src/os_unix.c 661b48c533c762452f6046a167679b8cd501b217 -F src/os_win.c 59972cd57edd76a5e77fb275043c25a5b1e392c1 +F src/os_unix.c 23eb5f56fac54d8fe0cb204291f3b3b2d94f23fc +F src/os_win.c 2da99cf07da7db6bcb1974013abfd89ec74749b3 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 5283581c8ce8950ff483a0b3a3cab9cb4d25a21e F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 @@ -1255,7 +1255,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ca43812bde499a23244e2860d3ceddc97d29f09e -R 6559d7e54df8a22fb50a87822b5b85b8 +P 48f553b05c05373c0af4b9c3a542979db3a2ee19 +R dd26855992180d2c266361c3b03d1c94 U drh -Z df85d6bb8cf9b5c163c2dd25f571385a +Z d6ff6b1ef48aec60635037ca357742fb diff --git a/manifest.uuid b/manifest.uuid index 55edfe4d06..d13d6c72af 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -48f553b05c05373c0af4b9c3a542979db3a2ee19 \ No newline at end of file +93ce2bca701efc67aeb517c4d641bde71332e8a0 \ No newline at end of file diff --git a/src/loadext.c b/src/loadext.c index 19850786d8..5a2b9d297c 100644 --- a/src/loadext.c +++ b/src/loadext.c @@ -653,7 +653,7 @@ int sqlite3_auto_extension(void (*xInit)(void)){ }else #endif { - int i; + u32 i; #if SQLITE_THREADSAFE sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); #endif @@ -697,7 +697,7 @@ int sqlite3_cancel_auto_extension(void (*xInit)(void)){ int n = 0; wsdAutoextInit; sqlite3_mutex_enter(mutex); - for(i=wsdAutoext.nExt-1; i>=0; i--){ + for(i=(int)wsdAutoext.nExt-1; i>=0; i--){ if( wsdAutoext.aExt[i]==xInit ){ wsdAutoext.nExt--; wsdAutoext.aExt[i] = wsdAutoext.aExt[wsdAutoext.nExt]; @@ -735,7 +735,7 @@ void sqlite3_reset_auto_extension(void){ ** If anything goes wrong, set an error in the database connection. */ void sqlite3AutoLoadExtensions(sqlite3 *db){ - int i; + u32 i; int go = 1; int rc; int (*xInit)(sqlite3*,char**,const sqlite3_api_routines*); diff --git a/src/os_unix.c b/src/os_unix.c index 74710a8b76..9ec100323c 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -6135,7 +6135,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nBuf, char *zBuf){ */ memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); -#if !defined(SQLITE_TEST) +#if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) { int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); diff --git a/src/os_win.c b/src/os_win.c index ece7103c96..0ebea5afc0 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -5372,7 +5372,7 @@ static void winDlClose(sqlite3_vfs *pVfs, void *pHandle){ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){ int n = 0; UNUSED_PARAMETER(pVfs); -#if defined(SQLITE_TEST) +#if defined(SQLITE_TEST) || defined(SQLITE_OMIT_RANDOMNESS) n = nBuf; memset(zBuf, 0, nBuf); #else @@ -5406,7 +5406,6 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){ memcpy(&zBuf[n], &i, sizeof(i)); n += sizeof(i); } -#endif #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_WIN32_USE_UUID if( sizeof(UUID)<=nBuf-n ){ UUID id; @@ -5423,6 +5422,7 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){ n += sizeof(UUID); } #endif +#endif /* defined(SQLITE_TEST) || defined(SQLITE_ZERO_PRNG_SEED) */ return n; }