Use #ifdef logic to avoid an always-true branch when

SQLITE_MAX_WORKER_THREADS=0

FossilOrigin-Name: 88cfe6d7de5f19f484304d0db585eac5de6c00ae

diff --git a/manifest b/manifest
index 2bf8b35c712fcfe23a373fb5bf4c45f634af0686..5971b7a8b5409bc6982afd1f938a29e772bb821c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\s#ifdef\sto\somit\scode\sthat\sis\snot\sused\swhen\sSQLITE_MAX_WORKER_THREADS\sis\szero.
-D 2014-05-15T16:56:56.755
+C Use\s#ifdef\slogic\sto\savoid\san\salways-true\sbranch\swhen\nSQLITE_MAX_WORKER_THREADS=0
+D 2014-05-16T12:18:08.658
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de92112472618cb869d27249966bad1783e4a853
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c 0cb40c336c04e2ada936fc4e17a6c6cb885af8c6
+F src/vdbesort.c 7946115f7c3e0d6156121d5e39512e3e980da134
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1175,7 +1175,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
-P d7e2b0d9cb099eda3341bc934bedff9facfe88bd
-R e9a885bf89bf1a3baa55ce358814bd90
+P 2e8d287d4f41d395a488bf65b20e956b0e311177
+R e7717e2e9621a181baf0cb2712e277d2
 U drh
-Z 872834e0bfb672176645b5e47ef04abb
+Z 12a20c396c3fdadc5d2762a7d632efff

diff --git a/manifest.uuid b/manifest.uuid
index 9ae9c294db0b0212d9d54c537327b39029d2fe64..ec40eff80f813074cd59616c65e8d4b816cd0f81 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e8d287d4f41d395a488bf65b20e956b0e311177
\ No newline at end of file
+88cfe6d7de5f19f484304d0db585eac5de6c00ae
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index ef8e7f6349d21ac8b24c100cff5cc1b64d2f22bb..3bd19e1c36f31f7a866fab7b4a23bf18946866ed 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -829,7 +829,7 @@ int sqlite3VdbeSorterInit(
   int sz;                         /* Size of pSorter in bytes */
   int rc = SQLITE_OK;
 #if SQLITE_MAX_WORKER_THREADS==0
-  const int nWorker = 0;
+# define nWorker 0
 #else
   int nWorker = (sqlite3GlobalConfig.bCoreMutex?sqlite3GlobalConfig.nWorker:0);
 #endif
@@ -879,6 +879,7 @@ int sqlite3VdbeSorterInit(
 
   return rc;
 }
+#undef nWorker   /* Defined at the top of this function */
 
 /*
 ** Free the list of sorted records starting at pRecord.
@@ -1806,9 +1807,8 @@ static int vdbeIncrNew(
   IncrMerger **ppOut
 ){
   int rc = SQLITE_OK;
-  IncrMerger *pIncr = *ppOut = (IncrMerger*)sqlite3_malloc(sizeof(IncrMerger));
+  IncrMerger *pIncr = *ppOut = (IncrMerger*)sqlite3MallocZero(sizeof(*pIncr));
   if( pIncr ){
-    memset(pIncr, 0, sizeof(IncrMerger));
     pIncr->pMerger = pMerger;
     pIncr->pTask = pTask;
     pIncr->mxSz = MAX(pTask->pSorter->mxKeysize+9,pTask->pSorter->mxPmaSize/2);