Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix harmless compiler warnings in the FTS expression parser. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | fts3-expr-rebalance |
| Files: | files | file ages | folders |
| SHA1: |
3c78af8c535e16518f18733325f4cd1d |
| User & Date: | drh 2013-04-26 13:14:19 |
Context
|
2013-04-26
| ||
| 14:04 | Merge another trunk change. (Closed-Leaf check-in: 2648966f user: dan tags: fts3-expr-rebalance) | |
| 13:14 | Fix harmless compiler warnings in the FTS expression parser. (check-in: 3c78af8c user: drh tags: fts3-expr-rebalance) | |
| 06:58 | Merge latest trunk changes. (check-in: 4d08e74d user: dan tags: fts3-expr-rebalance) | |
Changes
Changes to ext/fts3/fts3_expr.c.
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
...
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
|
/* An error occurred. Delete the contents of the apLeaf[] array
** and pFree list. Everything else is cleaned up by the call to
** sqlite3Fts3ExprFree(pRoot) below. */
Fts3Expr *pDel;
for(i=0; i<nMaxDepth; i++){
sqlite3Fts3ExprFree(apLeaf[i]);
}
while( pDel=pFree ){
pFree = pDel->pParent;
sqlite3_free(pDel);
}
}
assert( pFree==0 );
sqlite3_free( apLeaf );
................................................................................
char **azCol, /* Array of column names for fts3 table */
int bFts4, /* True to allow FTS4-only syntax */
int nCol, /* Number of entries in azCol[] */
int iDefaultCol, /* Default column to query */
const char *z, int n, /* Text of MATCH query */
Fts3Expr **ppExpr /* OUT: Parsed query structure */
){
static const int MAX_EXPR_DEPTH = 12;
int nParsed;
int rc;
ParseContext sParse;
memset(&sParse, 0, sizeof(ParseContext));
sParse.pTokenizer = pTokenizer;
sParse.iLangid = iLangid;
|
|
<
|
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
...
931
932
933
934
935
936
937
938
939
940
941
942
943
944
|
/* An error occurred. Delete the contents of the apLeaf[] array
** and pFree list. Everything else is cleaned up by the call to
** sqlite3Fts3ExprFree(pRoot) below. */
Fts3Expr *pDel;
for(i=0; i<nMaxDepth; i++){
sqlite3Fts3ExprFree(apLeaf[i]);
}
while( (pDel=pFree)!=0 ){
pFree = pDel->pParent;
sqlite3_free(pDel);
}
}
assert( pFree==0 );
sqlite3_free( apLeaf );
................................................................................
char **azCol, /* Array of column names for fts3 table */
int bFts4, /* True to allow FTS4-only syntax */
int nCol, /* Number of entries in azCol[] */
int iDefaultCol, /* Default column to query */
const char *z, int n, /* Text of MATCH query */
Fts3Expr **ppExpr /* OUT: Parsed query structure */
){
int nParsed;
int rc;
ParseContext sParse;
memset(&sParse, 0, sizeof(ParseContext));
sParse.pTokenizer = pTokenizer;
sParse.iLangid = iLangid;
|