From: adamd <adamd@noemail.net>
Date: Mon, 18 Sep 2006 21:14:40 +0000 (+0000)
Subject: Fixed a build problem in sqlite3_extension_init(). (CVS 3430)
X-Git-Tag: version-3.6.10~2737
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d47522807e179066fb80c52f132afd1ab60ee518;p=thirdparty%2Fsqlite.git

Fixed a build problem in sqlite3_extension_init(). (CVS 3430)

FossilOrigin-Name: bb2e1871cb10b470f96c793bb137c043ef30e1da
---

diff --git a/ext/fts1/fts1.c b/ext/fts1/fts1.c
index 973c185e55..ddde412e89 100644
--- a/ext/fts1/fts1.c
+++ b/ext/fts1/fts1.c
@@ -2927,10 +2927,8 @@ int sqlite3Fts1Init(sqlite3 *db){
 #if !SQLITE_CORE
 int sqlite3_extension_init(sqlite3 *db, char **pzErrMsg,
                            const sqlite3_api_routines *pApi){
-  int rc;
   SQLITE_EXTENSION_INIT2(pApi)
-  rc = sqlite3Fts1Init(db);
-  if( rc ) return rc;
+  return sqlite3Fts1Init(db);
 }
 #endif
 
diff --git a/manifest b/manifest
index 484a052467..dc35284ee2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\sall\snames\sto\slower\scase\sbefore\ssending\sthem\sto\sthe\sxFindFunction\nmethod\sof\sa\svirtual\stable.\s\sIn\sFTS1,\suse\sstrcmp\sinstead\sof\sstrcasecmp.\nTicket\s#1981.\s(CVS\s3429)
-D 2006-09-18T20:24:03
+C Fixed\sa\sbuild\sproblem\sin\ssqlite3_extension_init().\s(CVS\s3430)
+D 2006-09-18T21:14:40
 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 c33206af7efcfea003863ca3e0038630cc6accf5
+F ext/fts1/fts1.c 50770451c8d3c693f7819dad33d397246f44ea90
 F ext/fts1/fts1.h 6060b8f62c1d925ea8356cb1a6598073eb9159a6
 F ext/fts1/fts1_hash.c 3196cee866edbebb1c0521e21672e6d599965114
 F ext/fts1/fts1_hash.h 957d378355ed29f672cd5add012ce8b088a5e089
@@ -399,7 +399,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P efa8fb32a596c7232bb1754b3231e4f2421df75b
-R 867d1b47989e3f735fc6f80577ade597
-U drh
-Z 426674e4ba6605580f3e345dc6e85b63
+P cd4e1de896ef715c444071f758b74dbb607e0572
+R cdcaff3d2acee8f53c20d70e6e102e11
+U adamd
+Z 00727001b33fedbb26b4905a3830ed9f
diff --git a/manifest.uuid b/manifest.uuid
index 5ef28405d5..2a73078c93 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd4e1de896ef715c444071f758b74dbb607e0572
\ No newline at end of file
+bb2e1871cb10b470f96c793bb137c043ef30e1da
\ No newline at end of file