Slight change to the --timer output on wordcount for better display on

windows:  Avoid showing the full pathname of the executable.

FossilOrigin-Name: b9e047b9e3c2ee4df4a2d921db62f590fa5452d3

diff --git a/manifest b/manifest
index 78fc61f7eab37c75194315b5941112228a13e779..ff465e9eb54698f9c9b2ff3399db0b28c0608dab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\ssome\soffset\sand\samount\sparameters\sfrom\s"int"\sto\s"u32"\sto\savoid\nharmless\ssigned/unsigned\scomparison\swarnings.
-D 2013-11-21T21:59:53.570
+C Slight\schange\sto\sthe\s--timer\soutput\son\swordcount\sfor\sbetter\sdisplay\son\s\nwindows:\s\sAvoid\sshowing\sthe\sfull\spathname\sof\sthe\sexecutable.
+D 2013-11-21T22:02:52.851
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1089,7 +1089,7 @@ F test/without_rowid1.test aaa26da19d543cd8d3d2d0e686dfa255556c15c8
 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99
 F test/without_rowid3.test eac3d5c8a1924725b58503a368f2cbd24fd6c8a0
 F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
-F test/wordcount.c 6ce4090a90cd4a34b7cf7f8969c033cedab72399
+F test/wordcount.c 800b6ab98ac05b7c6343575c45055f72273c9cc2
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
 F tool/build-all-msvc.bat 1bac6adc3fdb4d9204f21d17b14be25778370e48 x
@@ -1141,7 +1141,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 586c11ed7cc6b8e2c7181231e37791c2fbc95272
-R 723b7c82330581cbe6be5156936bfadc
+P 4e8c5d0795cb7c603182bfa70f3855d654f0997e
+R ffed574cf9d774930b45b0d81c7e5184
 U drh
-Z 3bf6b81cb7a632df512ea0b6d5ca4d08
+Z 0797bb1805b05388278b1c28ef08180c

diff --git a/manifest.uuid b/manifest.uuid
index 9fe6a08b40850312467396e9075406f653c30485..3cc841abaaf10d385c560e36cbfd4dcf66e86721 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e8c5d0795cb7c603182bfa70f3855d654f0997e
\ No newline at end of file
+b9e047b9e3c2ee4df4a2d921db62f590fa5452d3
\ No newline at end of file

diff --git a/test/wordcount.c b/test/wordcount.c
index 24924e1b0ac005dcb8dbd1d66a7bd80c36be01e3..b21b4272bc6b93ce382218376e3869a01a35f09e 100644 (file)
--- a/test/wordcount.c
+++ b/test/wordcount.c
@@ -473,9 +473,9 @@ int main(int argc, char **argv){
 
   if( showTimer ){
     sqlite3_int64 elapseTime = realTime() - startTime;
-    fprintf(stderr, "%3d.%03d", (int)(elapseTime/1000),
+    fprintf(stderr, "%3d.%03d wordcount", (int)(elapseTime/1000),
                                    (int)(elapseTime%1000));
-    for(i=0; i<argc; i++) if( i!=showTimer ) fprintf(stderr, " %s", argv[i]);
+    for(i=1; i<argc; i++) if( i!=showTimer ) fprintf(stderr, " %s", argv[i]);
     fprintf(stderr, "\n");
   }