From: drh <drh@noemail.net>
Date: Fri, 24 Jun 2011 11:29:51 +0000 (+0000)
Subject: Fix some harmless compiler warnings that were occurring with THREADSAFE=0.
X-Git-Tag: version-3.7.8~38^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df3aa16e2bd0543ec80be0703a429cbcf7923403;p=thirdparty%2Fsqlite.git

Fix some harmless compiler warnings that were occurring with THREADSAFE=0.

FossilOrigin-Name: 9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8
---

diff --git a/manifest b/manifest
index 6afb8c5324..703d2960ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.7.7\srelease\scandidate\s#1.
-D 2011-06-23T19:49:22.376
+C Fix\ssome\sharmless\scompiler\swarnings\sthat\swere\soccurring\swith\sTHREADSAFE=0.
+D 2011-06-24T11:29:51.234
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -131,7 +131,7 @@ F src/build.c 5a428625d21ad409514afb40ad083bee25dd957a
 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
-F src/date.c d3c11de76392ea62637bfac0f4655889fc2f5a85
+F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 F src/delete.c 4925f9121525fc871f5d8d13c1f7dcc91abb38bb
 F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
@@ -165,7 +165,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 07acbb3e074e52b48a4248c06f66c9a91db1a0ce
+F src/os_unix.c d3e7b17100704ee0fe2ef71a98c478b947480f4d
 F src/os_win.c eafcd6b91cf204a7ef29ac1ef2a1b7132e132e58
 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -948,8 +948,8 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P b61a76a53af04f731fe7617f7b6b4fb2aef6587b
-R 5805b6f3882ce897a61c4ce87076bc70
+F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
+P 4374b7e83ea0a3fbc3691f9c0c936272862f32f2
+R 1f317b87075f75e0f868cf711b7bb21e
 U drh
-Z a111ec09c232c3c09811b275ae45bf17
+Z 5efaa6b46127bcc37e3b2f98e5f441cd
diff --git a/manifest.uuid b/manifest.uuid
index 1781623b8d..b9b8f7e7c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4374b7e83ea0a3fbc3691f9c0c936272862f32f2
\ No newline at end of file
+9b191bb4c7c1e1b12b188c0b3eee1f8f587887c8
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index c0744e8c72..f9411ea5b3 100644
--- a/src/date.c
+++ b/src/date.c
@@ -427,7 +427,9 @@ static int osLocaltime(time_t *t, struct tm *pTm){
 #if (!defined(HAVE_LOCALTIME_R) || !HAVE_LOCALTIME_R) \
       && (!defined(HAVE_LOCALTIME_S) || !HAVE_LOCALTIME_S)
   struct tm *pX;
+#if SQLITE_THREADSAFE>0
   sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
   sqlite3_mutex_enter(mutex);
   pX = localtime(t);
 #ifndef SQLITE_OMIT_BUILTIN_TEST
diff --git a/src/os_unix.c b/src/os_unix.c
index 682e74c958..f9a12a2fb9 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3672,7 +3672,7 @@ static void unixShmPurge(unixFile *pFd){
   if( p && p->nRef==0 ){
     int i;
     assert( p->pInode==pFd->pInode );
-    if( p->mutex ) sqlite3_mutex_free(p->mutex);
+    sqlite3_mutex_free(p->mutex);
     for(i=0; i<p->nRegion; i++){
       if( p->h>=0 ){
         munmap(p->apRegion[i], p->szRegion);
diff --git a/tool/warnings.sh b/tool/warnings.sh
index e1fa2b2d91..2eb3992f09 100644
--- a/tool/warnings.sh
+++ b/tool/warnings.sh
@@ -8,7 +8,11 @@ echo '********** No optimizations.  Includes FTS4 and RTREE *********'
 gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
       -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
       sqlite3.c
-echo '********** Optimized -O3.  Includes FTS4 and RTREE *********'
+echo '********** No optimizations. ENABLE_STAT2. THREADSAFE=0 *******'
+gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
+      -ansi -DSQLITE_ENABLE_STAT2 -DSQLITE_THREADSAFE=0 \
+      sqlite3.c
+echo '********** Optimized -O3.  Includes FTS4 and RTREE ************'
 gcc -O3 -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
       -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
       sqlite3.c