Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: third_party/sqlite/src/ext/fts2/fts2.c

Issue 885473002: [sql] Rewrite sqlite patching "system". (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/src/ext/fts2/fts2.c
diff --git a/third_party/sqlite/src/ext/fts2/fts2.c b/third_party/sqlite/src/ext/fts2/fts2.c
index 4094b29afc9c28e208e1769e8e6bd24023356a61..36d14ffeb47f3afd3ceade73d3a78665f48d919c 100644
--- a/third_party/sqlite/src/ext/fts2/fts2.c
+++ b/third_party/sqlite/src/ext/fts2/fts2.c
@@ -324,7 +324,7 @@
#include "fts2_hash.h"
#include "fts2_tokenizer.h"
#include "sqlite3.h"
-#ifndef SQLITE_CORE
+#ifndef SQLITE_CORE
# include "sqlite3ext.h"
SQLITE_EXTENSION_INIT1
#endif
@@ -3765,7 +3765,7 @@ static int tokenizeSegment(
continue;
}
iEndLast = iEnd;
-
+
queryAdd(pQuery, pToken, nToken);
if( !inPhrase && iBegin>0 && pSegment[iBegin-1]=='-' ){
pQuery->pTerms[pQuery->nTerms-1].isNot = 1;
@@ -5552,7 +5552,7 @@ static int leavesReadersMerge(fulltext_vtab *v,
if( rc!=SQLITE_OK ) break;
}
if( rc!=SQLITE_OK ){
- while( i-->0 ){
+ while( i-->0 ){
dlrDestroy(&dlReaders[i]);
}
return rc;
@@ -6901,7 +6901,7 @@ static void createDoclistResult(sqlite3_context *pContext,
assert( pData!=NULL && nData>0 );
rc = dlrInit(&dlReader, DL_DEFAULT, pData, nData);
- if( rc!=SQLITE_OK ) return rc;
+ if( rc!=SQLITE_OK ) return;
dataBufferInit(&dump, 0);
for( ; rc==SQLITE_OK && !dlrAtEnd(&dlReader); rc = dlrStep(&dlReader) ){
char buf[256];
@@ -6952,7 +6952,7 @@ static void createDoclistResult(sqlite3_context *pContext,
dlrDestroy(&dlReader);
if( rc!=SQLITE_OK ){
dataBufferDestroy(&dump);
- return rc;
+ return;
}
assert( dump.nData>0 );
@@ -6965,7 +6965,6 @@ static void createDoclistResult(sqlite3_context *pContext,
sqlite3_result_text(pContext, dump.pData, dump.nData, sqlite3_free);
dump.pData = NULL;
dump.nData = dump.nCapacity = 0;
- return SQLITE_OK;
}
/* Implements dump_doclist() for use in inspecting the fts2 index from

Powered by Google App Engine
This is Rietveld 408576698