Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Mark fts3ReallocOrFree and fts3InitVtab as static. Ticket [ff44d82f3b]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a9038306c33c88120d8bef27209d8f06 |
| User & Date: | dan 2009-12-09 05:30:37 |
Context
|
2009-12-09
| ||
| 14:39 | Improve test coverage of fts3.c. check-in: 56b6432f user: dan tags: trunk | |
| 05:30 | Mark fts3ReallocOrFree and fts3InitVtab as static. Ticket [ff44d82f3b]. check-in: a9038306 user: dan tags: trunk | |
|
2009-12-08
| ||
| 22:16 | Change to order of two branches in vtab.c in order to a restore 100% test coverage. check-in: fdfdc777 user: drh tags: trunk | |
Changes
Changes to ext/fts3/fts3.c.
620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 |
** The argv[] array contains the following: ** ** argv[0] -> module name ** argv[1] -> database name ** argv[2] -> table name ** argv[...] -> "column name" and other module argument fields. */ int fts3InitVtab( int isCreate, /* True for xCreate, false for xConnect */ sqlite3 *db, /* The SQLite database connection */ void *pAux, /* Hash table containing tokenizers */ int argc, /* Number of elements in argv array */ const char * const *argv, /* xCreate/xConnect argument array */ sqlite3_vtab **ppVTab, /* Write the resulting vtab structure here */ char **pzErr /* Write any error message here */ |
| |
620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 |
** The argv[] array contains the following:
**
** argv[0] -> module name
** argv[1] -> database name
** argv[2] -> table name
** argv[...] -> "column name" and other module argument fields.
*/
static int fts3InitVtab(
int isCreate, /* True for xCreate, false for xConnect */
sqlite3 *db, /* The SQLite database connection */
void *pAux, /* Hash table containing tokenizers */
int argc, /* Number of elements in argv array */
const char * const *argv, /* xCreate/xConnect argument array */
sqlite3_vtab **ppVTab, /* Write the resulting vtab structure here */
char **pzErr /* Write any error message here */
|
Changes to ext/fts3/fts3_expr.c.
177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
}
/*
** Enlarge a memory allocation. If an out-of-memory allocation occurs,
** then free the old allocation.
*/
void *fts3ReallocOrFree(void *pOrig, int nNew){
void *pRet = sqlite3_realloc(pOrig, nNew);
if( !pRet ){
sqlite3_free(pOrig);
}
return pRet;
}
|
| |
177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
}
/*
** Enlarge a memory allocation. If an out-of-memory allocation occurs,
** then free the old allocation.
*/
static void *fts3ReallocOrFree(void *pOrig, int nNew){
void *pRet = sqlite3_realloc(pOrig, nNew);
if( !pRet ){
sqlite3_free(pOrig);
}
return pRet;
}
|