eliminate compile-time warnings related to missing field initializations (CVS 4936)

FossilOrigin-Name: d6a34d983e2181f1d1763bd3821a1e63f1e18818

diff --git a/manifest b/manifest
index 36f71a49e11c7754040b73b6a0b5581808c09d1a..472911dda8a5e0a4061a907967ffbcefbb4daee6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C add\sthree\smissing\sinitializers\s(CVS\s4935)
-D 2008-03-29T12:39:39
+C eliminate\scompile-time\swarnings\srelated\sto\smissing\sfield\sinitializations\s(CVS\s4936)
+D 2008-03-29T12:47:27
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in cf434ce8ca902e69126ae0f94fc9f7dc7428a5fa
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,7 +115,7 @@ F src/mem5.c 11d98b76f77873aab86b543cbd1a8ddc4e680d58
 F src/mutex.c d455f0876d5aad9935a23d01e6ae1bf4bd462d6a
 F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb
 F src/mutex_os2.c 2911ea96955ab6cba734cc4ad903fe76f834b39e
-F src/mutex_unix.c c54275523ba4d9b00d6c7783602929b5556dbaf9
+F src/mutex_unix.c 466d20378a0645fea64c3f2e2669c33b7802df56
 F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
 F src/os.c 7bc8d9b187836b87befcc5ae13158a7c55f82329
 F src/os.h 497bf5f0f2648461ef65940cfb59ba427430f3fc
@@ -619,7 +619,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 37dfcdf529378a8ef37ed8672e28339a7d9e9da6
-R 3fab5323830c9e5f851ba62a5a7e4363
+P f45f0593cf5dd8c0172b13c300a4a9393540e0d7
+R 2bc6a03eb48ceb5b75a14804df20ae59
 U rse
-Z b91c4d837768cbc5dcbf9f5608097187
+Z 6f338dc4b9adf1e8fe817f7710421312

diff --git a/manifest.uuid b/manifest.uuid
index 9b17a684978dca0d3ccf9585bde7a5f475f37187..d0e179f897392952b9f6779ab13a04d32cf2f527 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f45f0593cf5dd8c0172b13c300a4a9393540e0d7
\ No newline at end of file
+d6a34d983e2181f1d1763bd3821a1e63f1e18818
\ No newline at end of file

diff --git a/src/mutex_unix.c b/src/mutex_unix.c
index a21798af6803404760766b9e35e1f2f6a501f2b9..ebd3217eb4dc60eb5b2b7dcd3a11dc9cd1bb0122 100644 (file)
--- a/src/mutex_unix.c
+++ b/src/mutex_unix.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for pthreads
 **
-** $Id: mutex_unix.c,v 1.6 2008/03/26 18:34:43 danielk1977 Exp $
+** $Id: mutex_unix.c,v 1.7 2008/03/29 12:47:27 rse Exp $
 */
 #include "sqliteInt.h"
 
@@ -39,6 +39,11 @@ struct sqlite3_mutex {
   int trace;                 /* True to trace changes */
 #endif
 };
+#ifdef SQLITE_DEBUG
+#define SQLITE3_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER, 0, 0, (pthread_t)0, 0 }
+#else
+#define SQLITE3_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER, 0, 0, (pthread_t)0 }
+#endif
 
 /*
 ** The sqlite3_mutex_alloc() routine allocates a new
@@ -83,12 +88,12 @@ struct sqlite3_mutex {
 */
 sqlite3_mutex *sqlite3_mutex_alloc(int iType){
   static sqlite3_mutex staticMutexes[] = {
-    { PTHREAD_MUTEX_INITIALIZER, },
-    { PTHREAD_MUTEX_INITIALIZER, },
-    { PTHREAD_MUTEX_INITIALIZER, },
-    { PTHREAD_MUTEX_INITIALIZER, },
-    { PTHREAD_MUTEX_INITIALIZER, },
-    { PTHREAD_MUTEX_INITIALIZER, },
+    SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER
   };
   sqlite3_mutex *p;
   switch( iType ){