From: drh Date: Wed, 16 Mar 2011 17:05:28 +0000 (+0000) Subject: Add the -vfstrace option to the usage error message in the shell. X-Git-Tag: version-3.7.6~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b625e243e0b61b855d0551fef1b1b457d634cf4;p=thirdparty%2Fsqlite.git Add the -vfstrace option to the usage error message in the shell. FossilOrigin-Name: baca45c549e1c144257ee657258939640120e094 --- diff --git a/manifest b/manifest index 603d8e598e..ac9a29b955 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Add\sthe\sVFS-trace\sshim. -D 2011-03-16T16:56:29.108 +C Add\sthe\s-vfstrace\soption\sto\sthe\susage\serror\smessage\sin\sthe\sshell. +D 2011-03-16T17:05:28.564 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -180,7 +180,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c d24406c45dd2442eb2eeaac413439066b149c944 -F src/shell.c 1378c13b8a58e55409cc5386545ffd552de929e3 +F src/shell.c 75ec746b9661e9b5cf956ef4cd9833c0545ef037 F src/sqlite.h.in 369c767e6b9f101d63d8e4c5e40279f975ccec08 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 F src/sqliteInt.h 2cea3e47997e3f4d9b4f1ce62f99c35be1b5a586 @@ -917,14 +917,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P d9846834993079fb2e42d6bd2644b2154ef324d1 -R 2013b1ad097a7d85c1ea307de0fd7493 +P f49a9ef3387bd4453f5654ebe83fea445c03cf4d +R 10a20ce6ae78a895cdea10598348f18e U drh -Z 4add82de13b36ad23f5fa229ae2ae933 +Z acc5d93678df1d134e86d0d878bc7d5a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFNgOvAoxKgR168RlERAgnSAJ4ojV+ajE7GhQi3ztWXgDEl3wO4+ACeJUcm -bDZfksV2K6w+qpeNasjY+/Y= -=Kcyn +iD8DBQFNgO3boxKgR168RlERAjamAJ4kL/kDftJ0EQwueulbIUjVkAOzEQCfRxty +gHYZrl1EnYTdUM+hmPqP9As= +=p45y -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 8809f16c6c..d43b11e4c4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f49a9ef3387bd4453f5654ebe83fea445c03cf4d \ No newline at end of file +baca45c549e1c144257ee657258939640120e094 \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 80811f81d7..9d51aa95dc 100644 --- a/src/shell.c +++ b/src/shell.c @@ -2602,6 +2602,9 @@ static const char zOptions[] = " -nullvalue 'text' set text string for NULL values\n" " -version show SQLite version\n" " -vfs NAME use NAME as the default VFS\n" +#ifdef SQLITE_ENABLE_VFSTRACE + " -vfstrace enable tracing of all VFS calls\n" +#endif ; static void usage(int showDetail){ fprintf(stderr, @@ -2638,7 +2641,6 @@ int main(int argc, char **argv){ int i; int rc = 0; - Argv0 = argv[0]; main_init(&data); stdin_is_interactive = isatty(0); @@ -2696,7 +2698,7 @@ int main(int argc, char **argv){ void *pOutArg, int makeDefault ); - vfstrace_register("trace",0,(int(*)(const char*,void*))fputs, stderr, 1); + vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1); #endif }else if( strcmp(argv[i],"-vfs")==0 ){ sqlite3_vfs *pVfs = sqlite3_vfs_find(argv[++i]);