/ Check-in [55a03b96]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:A minor change to fts1.c to fix broken build. (CVS 3393)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 55a03b96251515a4817a0eefb197219a460640e7
User & Date: adamd 2006-09-05 18:21:32
Context
2006-09-06
21:39
Include io.h on Windows to quell a build warning about access() having no prototype. (CVS 3394) check-in: b3eb1732 user: adamd tags: trunk
2006-09-05
18:21
A minor change to fts1.c to fix broken build. (CVS 3393) check-in: 55a03b96 user: adamd tags: trunk
2006-09-04
18:54
Fix a bug in the new misc6.test script. Fix error messages when not compiled with memory debugging enabled. Ticket #1957. (CVS 3392) check-in: 9fb92024 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts1/fts1.c.

   538    538     *r++ = '\0';
   539    539     assert( r == result + len );
   540    540     return result;
   541    541   }
   542    542   
   543    543   static int sql_exec(sqlite3 *db, const char *zName, const char *zFormat){
   544    544     char *zCommand = string_format(zFormat, zName);
          545  +  int rc;
   545    546     TRACE(("FTS1 sql: %s\n", zCommand));
   546         -  int rc = sqlite3_exec(db, zCommand, NULL, 0, NULL);
          547  +  rc = sqlite3_exec(db, zCommand, NULL, 0, NULL);
   547    548     free(zCommand);
   548    549     return rc;
   549    550   }
   550    551   
   551    552   static int sql_prepare(sqlite3 *db, const char *zName, sqlite3_stmt **ppStmt,
   552    553                   const char *zFormat){
   553    554     char *zCommand = string_format(zFormat, zName);
          555  +  int rc;
   554    556     TRACE(("FTS1 prepare: %s\n", zCommand));
   555         -  int rc = sqlite3_prepare(db, zCommand, -1, ppStmt, NULL);
          557  +  rc = sqlite3_prepare(db, zCommand, -1, ppStmt, NULL);
   556    558     free(zCommand);
   557    559     return rc;
   558    560   }
   559    561   
   560    562   /* end utility functions */
   561    563   
   562    564   #define QUERY_GENERIC 0
................................................................................
  1010   1012     TRACE(("FTS1 Disconnect %p\n", pVTab));
  1011   1013     fulltext_vtab_destroy((fulltext_vtab *)pVTab);
  1012   1014     return SQLITE_OK;
  1013   1015   }
  1014   1016   
  1015   1017   static int fulltextDestroy(sqlite3_vtab *pVTab){
  1016   1018     fulltext_vtab *v = (fulltext_vtab *)pVTab;
         1019  +  int rc;
  1017   1020   
  1018   1021     TRACE(("FTS1 Destroy %p\n", pVTab));
  1019         -  int rc = sql_exec(v->db, v->zName,
         1022  +  rc = sql_exec(v->db, v->zName,
  1020   1023                       "drop table %_content; drop table %_term");
  1021   1024     if( rc!=SQLITE_OK ) return rc;
  1022   1025   
  1023   1026     fulltext_vtab_destroy((fulltext_vtab *)pVTab);
  1024   1027     return SQLITE_OK;
  1025   1028   }
  1026   1029