/ Check-in [16f83fec]
Login

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

Overview
Comment:Fix harmless compiler warnings in test code. No changes to the core.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 16f83fec77668c021694fbb189b415bd3b90adc8
User & Date: drh 2011-08-25 18:54:46
Context
2011-08-25
19:28
Replace an assert() that a condition may not occur in backup.c with code to handle that condition, which can occur. check-in: 472c74b3 user: dan tags: trunk
18:54
Fix harmless compiler warnings in test code. No changes to the core. check-in: 16f83fec user: drh tags: trunk
18:01
Disable external merge source when SQLITE_TEMP_STORE==3. Add documentation to the OP_OpenSorter opcode. check-in: 5a690486 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test_malloc.c.

  1218   1218     Tcl_Obj *CONST objv[]
  1219   1219   ){
  1220   1220     if( objc!=2 ){
  1221   1221       Tcl_WrongNumArgs(interp, 1, objv, "FILENAME");
  1222   1222       return TCL_ERROR;
  1223   1223     }
  1224   1224   
  1225         -  switch( (int)clientData ){
         1225  +  switch( SQLITE_PTR_TO_INT(clientData) ){
  1226   1226       case 3: {
  1227   1227   #ifdef SQLITE_ENABLE_MEMSYS3
  1228   1228         extern void sqlite3Memsys3Dump(const char*);
  1229   1229         sqlite3Memsys3Dump(Tcl_GetString(objv[1]));
  1230   1230         break;
  1231   1231   #endif
  1232   1232       }
................................................................................
  1456   1456        { "sqlite3_dump_memsys3",       test_dump_memsys3             ,3 },
  1457   1457        { "sqlite3_dump_memsys5",       test_dump_memsys3             ,5 },
  1458   1458        { "sqlite3_install_memsys3",    test_install_memsys3          ,0 },
  1459   1459        { "sqlite3_memdebug_vfs_oom_test", test_vfs_oom_test          ,0 },
  1460   1460     };
  1461   1461     int i;
  1462   1462     for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
  1463         -    ClientData c = (ClientData)aObjCmd[i].clientData;
         1463  +    ClientData c = (ClientData)SQLITE_INT_TO_PTR(aObjCmd[i].clientData);
  1464   1464       Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, c, 0);
  1465   1465     }
  1466   1466     return TCL_OK;
  1467   1467   }
  1468   1468   #endif

Changes to src/test_rtree.c.

    14     14   */
    15     15   
    16     16   #include <sqlite3.h>
    17     17   
    18     18   /* Solely for the UNUSED_PARAMETER() macro. */
    19     19   #include "sqliteInt.h"
    20     20   
           21  +#ifdef SQLITE_ENABLE_RTREE
    21     22   /* 
    22     23   ** Type used to cache parameter information for the "circle" r-tree geometry
    23     24   ** callback.
    24     25   */
    25     26   typedef struct Circle Circle;
    26     27   struct Circle {
    27     28     struct Box {
................................................................................
   226    227      && aCoord[5]>=pCube->z
   227    228     ){
   228    229       *piRes = 1;
   229    230     }
   230    231   
   231    232     return SQLITE_OK;
   232    233   }
          234  +#endif /* SQLITE_ENABLE_RTREE */
   233    235   
   234    236   static int register_cube_geom(
   235    237     void * clientData,
   236    238     Tcl_Interp *interp,
   237    239     int objc,
   238    240     Tcl_Obj *CONST objv[]
   239    241   ){

Changes to src/test_thread.c.

   301    301   static int sqlthread_id(
   302    302     ClientData clientData,
   303    303     Tcl_Interp *interp,
   304    304     int objc,
   305    305     Tcl_Obj *CONST objv[]
   306    306   ){
   307    307     Tcl_ThreadId id = Tcl_GetCurrentThread();
   308         -  Tcl_SetObjResult(interp, Tcl_NewIntObj((int)id));
          308  +  Tcl_SetObjResult(interp, Tcl_NewIntObj(SQLITE_PTR_TO_INT(id)));
   309    309     UNUSED_PARAMETER(clientData);
   310    310     UNUSED_PARAMETER(objc);
   311    311     UNUSED_PARAMETER(objv);
   312    312     return TCL_OK;
   313    313   }
   314    314   
   315    315