/ Check-in [a4755e70]
Login

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

Overview
Comment:Fix some minor and harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a4755e7088c3cc7c5ea191ce37f3950472f523ec
User & Date: drh 2011-05-25 23:18:02
Context
2011-05-26
14:19
Changes to work with SQLITE_OMIT_VIRTUAL_TABLE. check-in: 03f7d36a user: drh tags: trunk
2011-05-25
23:18
Fix some minor and harmless compiler warnings. check-in: a4755e70 user: drh tags: trunk
20:25
Ignore malloc failures within the WAL file truncation attempt for journal_size_limit. check-in: dd19105a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

  3661   3661       p->zDb, p->zName, zName
  3662   3662     );
  3663   3663     return rc;
  3664   3664   }
  3665   3665   
  3666   3666   static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
  3667   3667     Fts3Table *p = (Fts3Table*)pVtab;
         3668  +  UNUSED_PARAMETER(iSavepoint);
  3668   3669     assert( p->inTransaction );
  3669   3670     assert( p->mxSavepoint < iSavepoint );
  3670   3671     TESTONLY( p->mxSavepoint = iSavepoint );
  3671   3672     return sqlite3Fts3PendingTermsFlush(p);
  3672   3673   }
  3673   3674   static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
  3674   3675     TESTONLY( Fts3Table *p = (Fts3Table*)pVtab );
         3676  +  UNUSED_PARAMETER(iSavepoint);
         3677  +  UNUSED_PARAMETER(pVtab);
  3675   3678     assert( p->inTransaction );
  3676   3679     assert( p->mxSavepoint >= iSavepoint );
  3677   3680     TESTONLY( p->mxSavepoint = iSavepoint-1 );
  3678   3681     return SQLITE_OK;
  3679   3682   }
  3680   3683   static int fts3RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){
  3681   3684     Fts3Table *p = (Fts3Table*)pVtab;
         3685  +  UNUSED_PARAMETER(iSavepoint);
  3682   3686     assert( p->inTransaction );
  3683   3687     assert( p->mxSavepoint >= iSavepoint );
  3684   3688     TESTONLY( p->mxSavepoint = iSavepoint );
  3685   3689     sqlite3Fts3PendingTermsClear(p);
  3686   3690     return SQLITE_OK;
  3687   3691   }
  3688   3692   

Changes to ext/fts3/fts3_aux.c.

   338    338   ){
   339    339     Fts3auxCursor *pCsr = (Fts3auxCursor *)pCursor;
   340    340     Fts3Table *pFts3 = ((Fts3auxTable *)pCursor->pVtab)->pFts3Tab;
   341    341     int rc;
   342    342     int isScan;
   343    343   
   344    344     UNUSED_PARAMETER(nVal);
          345  +  UNUSED_PARAMETER(idxStr);
   345    346   
   346    347     assert( idxStr==0 );
   347    348     assert( idxNum==FTS4AUX_EQ_CONSTRAINT || idxNum==0
   348    349          || idxNum==FTS4AUX_LE_CONSTRAINT || idxNum==FTS4AUX_GE_CONSTRAINT
   349    350          || idxNum==(FTS4AUX_LE_CONSTRAINT|FTS4AUX_GE_CONSTRAINT)
   350    351     );
   351    352     isScan = (idxNum!=FTS4AUX_EQ_CONSTRAINT);
................................................................................
   455    456        fts3auxRowidMethod,          /* xRowid        */
   456    457        0,                           /* xUpdate       */
   457    458        0,                           /* xBegin        */
   458    459        0,                           /* xSync         */
   459    460        0,                           /* xCommit       */
   460    461        0,                           /* xRollback     */
   461    462        0,                           /* xFindFunction */
   462         -     0                            /* xRename       */
          463  +     0,                           /* xRename       */
          464  +     0,                           /* xSavepoint    */
          465  +     0,                           /* xRelease      */
          466  +     0                            /* xRollbackTo   */
   463    467     };
   464    468     int rc;                         /* Return code */
   465    469   
   466    470     rc = sqlite3_create_module(db, "fts4aux", &fts3aux_module, 0);
   467    471     return rc;
   468    472   }
   469    473   
   470    474   #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */

Changes to ext/rtree/rtree.c.

  2845   2845       rc = sqlite3_exec(pRtree->db, zSql, 0, 0, 0);
  2846   2846       sqlite3_free(zSql);
  2847   2847     }
  2848   2848     return rc;
  2849   2849   }
  2850   2850   
  2851   2851   static sqlite3_module rtreeModule = {
  2852         -  0,                         /* iVersion */
         2852  +  0,                          /* iVersion */
  2853   2853     rtreeCreate,                /* xCreate - create a table */
  2854   2854     rtreeConnect,               /* xConnect - connect to an existing table */
  2855   2855     rtreeBestIndex,             /* xBestIndex - Determine search strategy */
  2856   2856     rtreeDisconnect,            /* xDisconnect - Disconnect from a table */
  2857   2857     rtreeDestroy,               /* xDestroy - Drop a table */
  2858   2858     rtreeOpen,                  /* xOpen - open a cursor */
  2859   2859     rtreeClose,                 /* xClose - close a cursor */
................................................................................
  2864   2864     rtreeRowid,                 /* xRowid - read data */
  2865   2865     rtreeUpdate,                /* xUpdate - write data */
  2866   2866     0,                          /* xBegin - begin transaction */
  2867   2867     0,                          /* xSync - sync transaction */
  2868   2868     0,                          /* xCommit - commit transaction */
  2869   2869     0,                          /* xRollback - rollback transaction */
  2870   2870     0,                          /* xFindFunction - function overloading */
  2871         -  rtreeRename                 /* xRename - rename the table */
         2871  +  rtreeRename,                /* xRename - rename the table */
         2872  +  0,                          /* xSavepoint */
         2873  +  0,                          /* xRelease */
         2874  +  0                           /* xRollbackTo */
  2872   2875   };
  2873   2876   
  2874   2877   static int rtreeSqlInit(
  2875   2878     Rtree *pRtree, 
  2876   2879     sqlite3 *db, 
  2877   2880     const char *zDb, 
  2878   2881     const char *zPrefix,