From: dan <dan@noemail.net>
Date: Thu, 7 Jul 2011 08:19:16 +0000 (+0000)
Subject: Add a target to main.mk that will fail if the amalgamation contains any exported... 
X-Git-Tag: version-3.7.8~38^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7152dc76b3c6ee3868c9e8741a1ca9625c17852;p=thirdparty%2Fsqlite.git

Add a target to main.mk that will fail if the amalgamation contains any exported symbols that do not begin with "sqlite3_". Run this target from within releasetest.tcl. Add "static" to a couple of private functions in mem3.c.

FossilOrigin-Name: a68b6580c7d436c896a644a475cdba33c2c8d6e6
---

diff --git a/main.mk b/main.mk
index 33b2e6ec14..16bb7115c9 100644
--- a/main.mk
+++ b/main.mk
@@ -565,6 +565,13 @@ $(TEST_EXTENSION): $(TOP)/src/test_loadext.c
 extensiontest: testfixture$(EXE) $(TEST_EXTENSION)
 	./testfixture$(EXE) $(TOP)/test/loadext.test
 
+# This target will fail if the SQLite amalgamation contains any exported
+# symbols that do not begin with "sqlite3_". It is run as part of the
+# releasetest.tcl script.
+#
+checksymbols: sqlite3.o
+	nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
+
 
 # Standard install and cleanup targets
 #
diff --git a/manifest b/manifest
index 89d2fa15b5..89d0ab3824 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\saccidental\sglobal\svariable\s"doclist"\sfrom\sfts3Int.h.
-D 2011-07-07T07:37:53.958
+C Add\sa\starget\sto\smain.mk\sthat\swill\sfail\sif\sthe\samalgamation\scontains\sany\sexported\ssymbols\sthat\sdo\snot\sbegin\swith\s"sqlite3_".\sRun\sthis\starget\sfrom\swithin\sreleasetest.tcl.\sAdd\s"static"\sto\sa\scouple\sof\sprivate\sfunctions\sin\smem3.c.
+D 2011-07-07T08:19:16.876
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -104,7 +104,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk d799fb600383cee11fed58876a7cccb749dd2614
+F main.mk d81d86f0f70444f3abc241eccf5ace4a79ff9b69
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -151,7 +151,7 @@ F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
-F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
+F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
 F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
 F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
@@ -630,7 +630,7 @@ F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
 F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
-F test/releasetest.tcl c0c0865f1dff08dde08a964ef49e83217ebedbf8
+F test/releasetest.tcl fa302d03fd9acfce6d910553a33473bfcf561958
 F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
@@ -950,7 +950,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 335736637c4ac3fe56a44fe01d4c037aaefa916a
-R b695993b25d82559c7810189a37bcfab
+P f244b2f3959e86fac555b91438cfe90528ab1648
+R 6592aa0ef1e7319ccd9410585affa7e2
 U dan
-Z 2063226294bddc8bcb5afad858fcd8e0
+Z ed79b421c9d7255d4a5ce5800ff3667b
diff --git a/manifest.uuid b/manifest.uuid
index a846e9ae62..a1121262cc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f244b2f3959e86fac555b91438cfe90528ab1648
\ No newline at end of file
+a68b6580c7d436c896a644a475cdba33c2c8d6e6
\ No newline at end of file
diff --git a/src/mem3.c b/src/mem3.c
index e2d66815b3..1a1b791f28 100644
--- a/src/mem3.c
+++ b/src/mem3.c
@@ -433,7 +433,7 @@ static void *memsys3MallocUnsafe(int nByte){
 ** This function assumes that the necessary mutexes, if any, are
 ** already held by the caller. Hence "Unsafe".
 */
-void memsys3FreeUnsafe(void *pOld){
+static void memsys3FreeUnsafe(void *pOld){
   Mem3Block *p = (Mem3Block*)pOld;
   int i;
   u32 size, x;
@@ -508,7 +508,7 @@ static void *memsys3Malloc(int nBytes){
 /*
 ** Free memory.
 */
-void memsys3Free(void *pPrior){
+static void memsys3Free(void *pPrior){
   assert( pPrior );
   memsys3Enter();
   memsys3FreeUnsafe(pPrior);
@@ -518,7 +518,7 @@ void memsys3Free(void *pPrior){
 /*
 ** Change the size of an existing memory allocation
 */
-void *memsys3Realloc(void *pPrior, int nBytes){
+static void *memsys3Realloc(void *pPrior, int nBytes){
   int nOld;
   void *p;
   if( pPrior==0 ){
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 84542bb8a5..7725630187 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -155,10 +155,10 @@ array set ::Configs {
 
 array set ::Platforms {
   Linux-x86_64 {
+    "Debug-One"               "checksymbols test"
     "Secure-Delete"           test
     "Unlock-Notify"           "QUICKTEST_INCLUDE=notify2.test test"
     "Update-Delete-Limit"     test
-    "Debug-One"               test
     "Extra-Robustness"        test
     "Device-Two"              test
     "Ftrapv"                  test
@@ -177,6 +177,7 @@ array set ::Platforms {
   }
 }
 
+
 # End of configuration section.
 #########################################################################
 #########################################################################