From: drh <drh@noemail.net>
Date: Thu, 26 Nov 2015 22:12:41 +0000 (+0000)
Subject: The first argument to SQLITE_CONFIG_PAGECACHE, SQLITE_CONFIG_SCRATCH, and
X-Git-Tag: version-3.10.0~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6082f699e1ce60b67781b3133c83bdd34ebcc5e;p=thirdparty%2Fsqlite.git

The first argument to SQLITE_CONFIG_PAGECACHE, SQLITE_CONFIG_SCRATCH, and
SQLITE_CONFIG_HEAP must always be a pointer.

FossilOrigin-Name: 5e14cadff09d7425c8e1cc5e817f2b0609e52a46
---

diff --git a/manifest b/manifest
index ca8c3ee0ee..7225dffcc9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sthe\suserauth\sextension\sand\sno-authentication\sdatabases.\sRun\sthe\stests\sfor\sthis\sextension\sas\spart\sof\sthe\sDebug-One\smodule\sin\sreleasetest.tcl.
-D 2015-11-26T15:51:55.157
+C The\sfirst\sargument\sto\sSQLITE_CONFIG_PAGECACHE,\sSQLITE_CONFIG_SCRATCH,\sand\nSQLITE_CONFIG_HEAP\smust\salways\sbe\sa\spointer.
+D 2015-11-26T22:12:41.852
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -331,7 +331,7 @@ F src/pager.h 87c4118a71ba3965184148b379a6d93179071091
 F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
 F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
 F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
-F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
+F src/pcache1.c 46a110be31a8d9f9b41431733836822ca0dd27ab
 F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
 F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
 F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@ -374,7 +374,7 @@ F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
 F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
 F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa
 F src/test_loadext.c a5251f956ab6af21e138dc1f9c0399394a510cb4
-F src/test_malloc.c 27d9e11b6e9d30267465d41ad81edbe24256408b
+F src/test_malloc.c 8e1c2112fa4f543b46c990a8872f9e6d37938744
 F src/test_multiplex.c 9fefd23f6cc3fa9bf0748a5e453167e7b9f193ce
 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
 F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
@@ -1405,7 +1405,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P eb180b4f04d412dcd0af138e2dd7f62fbb5ac439
-R f2567fd8ad211c2f6878e625db7a4000
-U dan
-Z 033052b1e1d9566ff82c655910d67041
+P 8b15621952889b4ba53b2ea3171fef7ef0479ddb
+R a3e84259ce6e6a067ea3262d31b1f32d
+U drh
+Z 19eaefd26a6af3441c1f68a49d2dd3d1
diff --git a/manifest.uuid b/manifest.uuid
index ffee151b00..7899946004 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b15621952889b4ba53b2ea3171fef7ef0479ddb
\ No newline at end of file
+5e14cadff09d7425c8e1cc5e817f2b0609e52a46
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 256e53a579..3f56d025e2 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -65,7 +65,7 @@
 ** that is allocated when the page cache is created.  The size of the local
 ** bulk allocation can be adjusted using 
 **
-**     sqlite3_config(SQLITE_CONFIG_PAGECACHE, 0, 0, N).
+**     sqlite3_config(SQLITE_CONFIG_PAGECACHE, (void*)0, 0, N).
 **
 ** If N is positive, then N pages worth of memory are allocated using a single
 ** sqlite3Malloc() call and that memory is used for the first N pages allocated.
diff --git a/src/test_malloc.c b/src/test_malloc.c
index 3ab177dcb7..a3ff9d205b 100644
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -910,7 +910,7 @@ static int test_config_scratch(
   free(buf);
   if( sz<0 ){
     buf = 0;
-    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, 0, 0, 0);
+    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, (void*)0, 0, 0);
   }else{
     buf = malloc( sz*N + 1 );
     rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, buf, sz, N);
@@ -957,7 +957,7 @@ static int test_config_pagecache(
   Tcl_SetObjResult(interp, pRes);
 
   if( sz<0 ){
-    sqlite3_config(SQLITE_CONFIG_PAGECACHE, 0, 0, 0);
+    sqlite3_config(SQLITE_CONFIG_PAGECACHE, (void*)0, 0, 0);
   }else{
     buf = malloc( sz*N );
     sqlite3_config(SQLITE_CONFIG_PAGECACHE, buf, sz, N);