Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| 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: |
16f83fec77668c021694fbb189b415bd |
| User & Date: | drh 2011-08-25 18:54:46 |
|
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 to src/test_malloc.c.
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
....
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
|
Tcl_Obj *CONST objv[]
){
if( objc!=2 ){
Tcl_WrongNumArgs(interp, 1, objv, "FILENAME");
return TCL_ERROR;
}
switch( (int)clientData ){
case 3: {
#ifdef SQLITE_ENABLE_MEMSYS3
extern void sqlite3Memsys3Dump(const char*);
sqlite3Memsys3Dump(Tcl_GetString(objv[1]));
break;
#endif
}
................................................................................
{ "sqlite3_dump_memsys3", test_dump_memsys3 ,3 },
{ "sqlite3_dump_memsys5", test_dump_memsys3 ,5 },
{ "sqlite3_install_memsys3", test_install_memsys3 ,0 },
{ "sqlite3_memdebug_vfs_oom_test", test_vfs_oom_test ,0 },
};
int i;
for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
ClientData c = (ClientData)aObjCmd[i].clientData;
Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, c, 0);
}
return TCL_OK;
}
#endif
|
|
|
|
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
....
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
|
Tcl_Obj *CONST objv[]
){
if( objc!=2 ){
Tcl_WrongNumArgs(interp, 1, objv, "FILENAME");
return TCL_ERROR;
}
switch( SQLITE_PTR_TO_INT(clientData) ){
case 3: {
#ifdef SQLITE_ENABLE_MEMSYS3
extern void sqlite3Memsys3Dump(const char*);
sqlite3Memsys3Dump(Tcl_GetString(objv[1]));
break;
#endif
}
................................................................................
{ "sqlite3_dump_memsys3", test_dump_memsys3 ,3 },
{ "sqlite3_dump_memsys5", test_dump_memsys3 ,5 },
{ "sqlite3_install_memsys3", test_install_memsys3 ,0 },
{ "sqlite3_memdebug_vfs_oom_test", test_vfs_oom_test ,0 },
};
int i;
for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
ClientData c = (ClientData)SQLITE_INT_TO_PTR(aObjCmd[i].clientData);
Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, c, 0);
}
return TCL_OK;
}
#endif
|
Changes to src/test_rtree.c.
14
15
16
17
18
19
20
21
22
23
24
25
26
27
...
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
*/
#include <sqlite3.h>
/* Solely for the UNUSED_PARAMETER() macro. */
#include "sqliteInt.h"
/*
** Type used to cache parameter information for the "circle" r-tree geometry
** callback.
*/
typedef struct Circle Circle;
struct Circle {
struct Box {
................................................................................
&& aCoord[5]>=pCube->z
){
*piRes = 1;
}
return SQLITE_OK;
}
static int register_cube_geom(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
|
>
>
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
...
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
*/ #include <sqlite3.h> /* Solely for the UNUSED_PARAMETER() macro. */ #include "sqliteInt.h" #ifdef SQLITE_ENABLE_RTREE /* ** Type used to cache parameter information for the "circle" r-tree geometry ** callback. */ typedef struct Circle Circle; struct Circle { struct Box { ................................................................................ && aCoord[5]>=pCube->z ){ *piRes = 1; } return SQLITE_OK; } #endif /* SQLITE_ENABLE_RTREE */ static int register_cube_geom( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ |
Changes to src/test_thread.c.
301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 |
static int sqlthread_id(
ClientData clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
Tcl_ThreadId id = Tcl_GetCurrentThread();
Tcl_SetObjResult(interp, Tcl_NewIntObj((int)id));
UNUSED_PARAMETER(clientData);
UNUSED_PARAMETER(objc);
UNUSED_PARAMETER(objv);
return TCL_OK;
}
|
| |
301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 |
static int sqlthread_id(
ClientData clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
Tcl_ThreadId id = Tcl_GetCurrentThread();
Tcl_SetObjResult(interp, Tcl_NewIntObj(SQLITE_PTR_TO_INT(id)));
UNUSED_PARAMETER(clientData);
UNUSED_PARAMETER(objc);
UNUSED_PARAMETER(objv);
return TCL_OK;
}
|