A minor change to fts1.c to fix broken build. (CVS 3393)

FossilOrigin-Name: 55a03b96251515a4817a0eefb197219a460640e7

diff --git a/ext/fts1/fts1.c b/ext/fts1/fts1.c
index e2d1f5a0e52d5b366a3a16563df1637e6ae62be5..586f4945106a445661e6daa64ed1b96552a9c650 100644 (file)
--- a/ext/fts1/fts1.c
+++ b/ext/fts1/fts1.c
@@ -542,8 +542,9 @@ static char *string_format(const char *zFormat, const char *zName){
 
 static int sql_exec(sqlite3 *db, const char *zName, const char *zFormat){
   char *zCommand = string_format(zFormat, zName);
+  int rc;
   TRACE(("FTS1 sql: %s\n", zCommand));
-  int rc = sqlite3_exec(db, zCommand, NULL, 0, NULL);
+  rc = sqlite3_exec(db, zCommand, NULL, 0, NULL);
   free(zCommand);
   return rc;
 }
@@ -551,8 +552,9 @@ static int sql_exec(sqlite3 *db, const char *zName, const char *zFormat){
 static int sql_prepare(sqlite3 *db, const char *zName, sqlite3_stmt **ppStmt,
                 const char *zFormat){
   char *zCommand = string_format(zFormat, zName);
+  int rc;
   TRACE(("FTS1 prepare: %s\n", zCommand));
-  int rc = sqlite3_prepare(db, zCommand, -1, ppStmt, NULL);
+  rc = sqlite3_prepare(db, zCommand, -1, ppStmt, NULL);
   free(zCommand);
   return rc;
 }
@@ -1014,9 +1016,10 @@ static int fulltextDisconnect(sqlite3_vtab *pVTab){
 
 static int fulltextDestroy(sqlite3_vtab *pVTab){
   fulltext_vtab *v = (fulltext_vtab *)pVTab;
+  int rc;
 
   TRACE(("FTS1 Destroy %p\n", pVTab));
-  int rc = sql_exec(v->db, v->zName,
+  rc = sql_exec(v->db, v->zName,
                     "drop table %_content; drop table %_term");
   if( rc!=SQLITE_OK ) return rc;
 

diff --git a/manifest b/manifest
index 7e2157f505e89852469a5d7ad71b41c70ce3af28..86820736ac4f861d94ef96c093b37231fe44410f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\snew\smisc6.test\sscript.\s\sFix\serror\smessages\swhen\snot\ncompiled\swith\smemory\sdebugging\senabled.\s\sTicket\s#1957.\s(CVS\s3392)
-D 2006-09-04T18:54:14
+C A\sminor\schange\sto\sfts1.c\sto\sfix\sbroken\sbuild.\s(CVS\s3393)
+D 2006-09-05T18:21:32
 F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -21,7 +21,7 @@ F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
 F ext/fts1/ft_hash.h 1a35e654a235c2c662d3ca0dfc3138ad60b8b7d5
-F ext/fts1/fts1.c e4742aa2ed669c49120c7ccdb0730b3045ba4eb5
+F ext/fts1/fts1.c a17d32e474fe306bd195fd6752b5d4dbc90caecb
 F ext/fts1/fts1.h fe8e8f38dd6d2d2645b9b0d6972e80985249575f
 F ext/fts1/fts1_hash.c 3196cee866edbebb1c0521e21672e6d599965114
 F ext/fts1/fts1_hash.h 957d378355ed29f672cd5add012ce8b088a5e089
@@ -396,7 +396,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 2c63588b45f4e1ab9b9f1b72c901f3800433424a
-R f402629df719cd6a62a288d804cc12e4
-U drh
-Z 73048297660aa7bcb266fb7c1ff65219
+P 9fb92024bf5058bdc32066a0d07b93da575779fa
+R 7a0ae1e98ee3c864a6975ca4554852a8
+U adamd
+Z c63adab53ae160858e72e981eae8a8d5

diff --git a/manifest.uuid b/manifest.uuid
index 461d96b13ecde1db167200286dc8cf0d1c4db29f..4da2c19681a1e0d6c4ca183de688e52338871d8b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9fb92024bf5058bdc32066a0d07b93da575779fa
\ No newline at end of file
+55a03b96251515a4817a0eefb197219a460640e7
\ No newline at end of file