Update the test_vfstrace.c shim to conform to the new VFS interface for

xSetSystemCall and xGetSystemCall.

FossilOrigin-Name: ad4dc7b95f94fc9a5430c1305fb61d9de79b3365

diff --git a/manifest b/manifest
index 33efc4be6de8038103107dc32a2e726daf86840b..264197b79b27a450751c6bcab2387c38dd982b0a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Change\sthe\sxSetSyscall\smethods\sof\sthe\sVFS\sso\sthat\sthey\sdo\snot\scast\sobject\npointers\sinto\sfunction\spointers.\s\sFix\sother\sunrelated\scompiler\swarnings.
-D 2011-03-23T22:02:23.988
+C Update\sthe\stest_vfstrace.c\sshim\sto\sconform\sto\sthe\snew\sVFS\sinterface\sfor\nxSetSystemCall\sand\sxGetSystemCall.
+D 2011-03-23T22:51:46.061
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -226,7 +226,7 @@ F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
 F src/test_vfs.c 2ed8853c1e51ac6f9ea091f7ce4e0d618bba8b86
-F src/test_vfstrace.c f5c3b3b893d81a580d0f577e6d9bcfc1fd496136
+F src/test_vfstrace.c 2265c9895f350c8d3c39b079998fbe7481505cc1
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
 F src/trigger.c ec4813709e990a169b6923293e839fa5dfd64282
@@ -918,14 +918,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7aaf8772274422f5020fad9eea490e195170720f
-R 5f5be2467ac2e1a296459a4f106ade8d
+P e059152adce3a8fb693f082b82b5669a238c8d6f
+R 75d6f66061beba76adb202eec759f027
 U drh
-Z fe6ea374366d1c79bf722f1efd9278ca
+Z ff6f0ffde7e5c35f37c4810c75e3b0d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNim3zoxKgR168RlERAinxAJ4/cXafMYIecY7RnHEnjd/FDN5wWgCeO1Gr
-HyMtzimZVos8zD8aJn2Sy94=
-=JB2d
+iD8DBQFNinmFoxKgR168RlERAg4aAJ0bc0wkWU8kJ2SehXvc1alhmb7iSQCfdz3j
+iMfJCE03+JzoqhiA/n+t9qM=
+=Mkm7
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 49ea63e4ef2edf0609ed6e17a06d954c63d99f30..3c4c359e7c29c453d228ea6ffcd8337152960c88 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e059152adce3a8fb693f082b82b5669a238c8d6f
\ No newline at end of file
+ad4dc7b95f94fc9a5430c1305fb61d9de79b3365
\ No newline at end of file

diff --git a/src/test_vfstrace.c b/src/test_vfstrace.c
index 24bd0afaeec420e7768da968c6aaa84af42bfa38..073eab631b9c0a7acfd8798856c796f153d459cd 100644 (file)
--- a/src/test_vfstrace.c
+++ b/src/test_vfstrace.c
@@ -77,8 +77,8 @@ static int vfstraceSleep(sqlite3_vfs*, int microseconds);
 static int vfstraceCurrentTime(sqlite3_vfs*, double*);
 static int vfstraceGetLastError(sqlite3_vfs*, int, char*);
 static int vfstraceCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
-static int vfstraceSetSystemCall(sqlite3_vfs*, const char *zName, void *pFunc);
-static void *vfstraceGetSystemCall(sqlite3_vfs*, const char *zName);
+static int vfstraceSetSystemCall(sqlite3_vfs*,const char*, sqlite3_syscall_ptr);
+static sqlite3_syscall_ptr vfstraceGetSystemCall(sqlite3_vfs*, const char *);
 static const char *vfstraceNextSystemCall(sqlite3_vfs*, const char *zName);
 
 /*
@@ -682,13 +682,16 @@ static int vfstraceGetLastError(sqlite3_vfs *pVfs, int iErr, char *zErr){
 static int vfstraceSetSystemCall(
   sqlite3_vfs *pVfs,
   const char *zName,
-  void *pFunc
+  sqlite3_syscall_ptr pFunc
 ){
   vfstrace_info *pInfo = (vfstrace_info*)pVfs->pAppData;
   sqlite3_vfs *pRoot = pInfo->pRootVfs;
   return pRoot->xSetSystemCall(pRoot, zName, pFunc);
 }
-static void *vfstraceGetSystemCall(sqlite3_vfs *pVfs, const char *zName){
+static sqlite3_syscall_ptr vfstraceGetSystemCall(
+  sqlite3_vfs *pVfs,
+  const char *zName
+){
   vfstrace_info *pInfo = (vfstrace_info*)pVfs->pAppData;
   sqlite3_vfs *pRoot = pInfo->pRootVfs;
   return pRoot->xGetSystemCall(pRoot, zName);