Fix a couple of (harmless) intel compiler warnings. (CVS 3034)

FossilOrigin-Name: 2e23231f0c10b2bba9e08ea47859e2c0ffa84c76

diff --git a/manifest b/manifest
index 95f2f97811a4ae34774ca4a09023a80893ef280f..e843601a262bed8867db2d104021302c93034f21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\scomments\son\sthe\sopcode.h\sbuilding\sscript.\s(CVS\s3033)
-D 2006-01-26T14:29:59
+C Fix\sa\scouple\sof\s(harmless)\sintel\scompiler\swarnings.\s(CVS\s3034)
+D 2006-01-27T06:32:00
 F Makefile.in e936c6fc3134838318aa0335a85041e6da31f6ee
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -55,7 +55,7 @@ F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
 F src/os_common.h 061fba8511a656b118551424f64e366ad0d4cb3b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c b25eca667f926d24b542fb20378b3665feccfe2b
+F src/os_unix.c 73c5e722a661ed98d8919f204911e4e34e51fa41
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 566bf7b41b72556fd7dca390bceaa2769dc395e9
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -347,7 +347,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 1658ea53c929f26741d788d170368d37ae5fd105
-R 8cc13ebb48c25205bb4460d7286c91b2
-U drh
-Z 9ac8babc6b94a319747466ad0d722afb
+P 7ccebf68eb1f707c2349004ae33575b484cc31a2
+R af3a62a74947b66d5764f2eab77a8c84
+U danielk1977
+Z b88f808b21bcdeecec76ffb8f4e035ac

diff --git a/manifest.uuid b/manifest.uuid
index 7a1e023f034ece2462da3126fa2dda5a4b7c9401..c7b4d635e33e3de36676e1c6bfb6febe718c767d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ccebf68eb1f707c2349004ae33575b484cc31a2
\ No newline at end of file
+2e23231f0c10b2bba9e08ea47859e2c0ffa84c76
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index aa4f5736feb246893e70c2e8e092a5ed293d15bd..074f07399a7edcfd90a0c9f2220afdafd3dea96e 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -450,7 +450,7 @@ static void *threadLockingTest(void *pArg){
 ** can override each others locks then sets the 
 ** threadsOverrideEachOthersLocks variable appropriately.
 */
-static void testThreadLockingBehavior(fd_orig){
+static void testThreadLockingBehavior(int fd_orig){
   int fd;
   struct threadTestData d[2];
   pthread_t t[2];
@@ -1752,7 +1752,8 @@ int sqlite3_tsd_count = 0;
 ** unallocated or gets deallocated.
 */
 ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){
-  static const ThreadData zeroData;
+  static const ThreadData zeroData = {0};  /* Initializer to silence warnings
+                                           ** from broken compilers */
 #ifdef SQLITE_UNIX_THREADS
   static pthread_key_t key;
   static int keyInit = 0;