Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Avoid an 'invalid cast' warning in test_osinst.c. (CVS 6144) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
931f3a21bd4b6c5760ed64c23e8210cf |
| User & Date: | danielk1977 2009-01-08 17:57:32 |
|
2009-01-08
| ||
| 18:04 | Fix a comment in pager.c. No actual code changes. (CVS 6145) (check-in: 44d3bfdd user: danielk1977 tags: trunk) | |
| 17:57 | Avoid an 'invalid cast' warning in test_osinst.c. (CVS 6144) (check-in: 931f3a21 user: danielk1977 tags: trunk) | |
| 17:50 | Fix a couple of potential corruption problems in pager.c. (CVS 6143) (check-in: 5a39525b user: danielk1977 tags: trunk) | |
Changes to src/test_osinst.c.
10 10 ** 11 11 ****************************************************************************** 12 12 ** 13 13 ** This file contains the implementation of an SQLite vfs wrapper that 14 14 ** adds instrumentation to all vfs and file methods. C and Tcl interfaces 15 15 ** are provided to control the instrumentation. 16 16 ** 17 -** $Id: test_osinst.c,v 1.18 2008/07/25 13:32:45 drh Exp $ 17 +** $Id: test_osinst.c,v 1.19 2009/01/08 17:57:32 danielk1977 Exp $ 18 18 */ 19 19 20 20 #ifdef SQLITE_ENABLE_INSTVFS 21 21 /* 22 22 ** C interface: 23 23 ** 24 24 ** sqlite3_instvfs_create() ................................................................................ 176 176 */ 177 177 static int instOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *); 178 178 static int instDelete(sqlite3_vfs*, const char *zName, int syncDir); 179 179 static int instAccess(sqlite3_vfs*, const char *zName, int flags, int *); 180 180 static int instFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut); 181 181 static void *instDlOpen(sqlite3_vfs*, const char *zFilename); 182 182 static void instDlError(sqlite3_vfs*, int nByte, char *zErrMsg); 183 -static void *instDlSym(sqlite3_vfs*,void*, const char *zSymbol); 183 +static void (*instDlSym(sqlite3_vfs *pVfs, void *p, const char*zSym))(void); 184 184 static void instDlClose(sqlite3_vfs*, void*); 185 185 static int instRandomness(sqlite3_vfs*, int nByte, char *zOut); 186 186 static int instSleep(sqlite3_vfs*, int microseconds); 187 187 static int instCurrentTime(sqlite3_vfs*, double*); 188 188 189 189 static void binarylog_blob(sqlite3_vfs *, const char *, int, int); 190 190 ................................................................................ 453 453 static void instDlError(sqlite3_vfs *pVfs, int nByte, char *zErrMsg){ 454 454 REALVFS(pVfs)->xDlError(REALVFS(pVfs), nByte, zErrMsg); 455 455 } 456 456 457 457 /* 458 458 ** Return a pointer to the symbol zSymbol in the dynamic library pHandle. 459 459 */ 460 -static void *instDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){ 461 - return REALVFS(pVfs)->xDlSym(REALVFS(pVfs), pHandle, zSymbol); 460 +static void (*instDlSym(sqlite3_vfs *pVfs, void *p, const char *zSym))(void){ 461 + return REALVFS(pVfs)->xDlSym(REALVFS(pVfs), p, zSym); 462 462 } 463 463 464 464 /* 465 465 ** Close the dynamic library handle pHandle. 466 466 */ 467 467 static void instDlClose(sqlite3_vfs *pVfs, void *pHandle){ 468 468 REALVFS(pVfs)->xDlClose(REALVFS(pVfs), pHandle);