From: shaneh <shaneh@noemail.net>
Date: Thu, 10 Dec 2009 21:11:28 +0000 (+0000)
Subject: Avoid declaring and freeing test variables if SQLITE_TEST not defined.
X-Git-Tag: version-3.7.2~716
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef4114dd24de6b38661e753c671236c5b19c07c5;p=thirdparty%2Fsqlite.git

Avoid declaring and freeing test variables if SQLITE_TEST not defined.

FossilOrigin-Name: c2d22960f652264c48ec41b9ca4047aa142d86f7
---

diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c
index 9c5142e583..ab90be8fb6 100644
--- a/ext/fts3/fts3_tokenizer.c
+++ b/ext/fts3/fts3_tokenizer.c
@@ -466,10 +466,10 @@ int sqlite3Fts3InitHashTable(
   int rc = SQLITE_OK;
   void *p = (void *)pHash;
   const int any = SQLITE_ANY;
-  char *zTest = 0;
-  char *zTest2 = 0;
 
 #ifdef SQLITE_TEST
+  char *zTest = 0;
+  char *zTest2 = 0;
   void *pdb = (void *)db;
   zTest = sqlite3_mprintf("%s_test", zName);
   zTest2 = sqlite3_mprintf("%s_internal_test", zName);
@@ -486,10 +486,13 @@ int sqlite3Fts3InitHashTable(
    || SQLITE_OK!=(rc = sqlite3_create_function(db, zTest, 3, any, p, testFunc, 0, 0))
    || SQLITE_OK!=(rc = sqlite3_create_function(db, zTest2, 0, any, pdb, intTestFunc, 0, 0))
 #endif
-  );
+   );
 
+#ifdef SQLITE_TEST
   sqlite3_free(zTest);
   sqlite3_free(zTest2);
+#endif
+
   return rc;
 }
 
diff --git a/manifest b/manifest
index f5a1c62b21..d3a0d10191 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sunused\smacros\sand\stypes\sfrom\sfts3.c.
-D 2009-12-10T18:38:54
+C Avoid\sdeclaring\sand\sfreeing\stest\svariables\sif\sSQLITE_TEST\snot\sdefined.
+D 2009-12-10T21:11:28
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,7 +65,7 @@ F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
 F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295
 F ext/fts3/fts3_porter.c a651e287e02b49b565a6ccf9441959d434489156
 F ext/fts3/fts3_snippet.c 6c2eb6d872d66b2a9aa5663f2662e993f18a6496
-F ext/fts3/fts3_tokenizer.c 3dc76eaea6b58ecfbe50135b8473aa668d712dcd
+F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff
 F ext/fts3/fts3_tokenizer.h 7ff73caa3327589bf6550f60d93ebdd1f6a0fb5c
 F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b
 F ext/fts3/fts3_write.c ee50b8feb757bf0cddc522223ebd49f91985a1ad
@@ -778,7 +778,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6cbbae849990d99b7ffe252b642d6be49d0c7235
-R 67e72b818fcb37f382269bc958948c54
-U dan
-Z b4579d0afa6e2a80ce4411e6eade6c04
+P 83a80efe8a6c3d53a7f80b4c5f4e0f40aa0aa52f
+R 8163e80c84be878d9f2942fb9ff4a007
+U shaneh
+Z 9cfffe8e7f30c926aed50e2972d3c126
diff --git a/manifest.uuid b/manifest.uuid
index 1aa6431147..6e69fa6da8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83a80efe8a6c3d53a7f80b4c5f4e0f40aa0aa52f
\ No newline at end of file
+c2d22960f652264c48ec41b9ca4047aa142d86f7
\ No newline at end of file