Fix a bug in win32 command-line client introduced during efforts to reduce

the number of harmless compiler warnings (check-in (5982).) (CVS 5992)

FossilOrigin-Name: 6c0b2e7579ee5504617831a5e8bb6193e283ad30

diff --git a/manifest b/manifest
index fc696cadbcd75ea0820394a3a77d22eeac4a5d6f..6a34100c812df968a56b0d8ea042f5e0413cd4ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\samalgamation\snow\scompiles\scleanly\son\sGCC\swith\soptions\n-pedantic-errors\s-Wno-long-long.\s(CVS\s5991)
-D 2008-12-08T18:19:18
+C Fix\sa\sbug\sin\swin32\scommand-line\sclient\sintroduced\sduring\sefforts\sto\sreduce\nthe\snumber\sof\sharmless\scompiler\swarnings\s(check-in\s(5982).)\s(CVS\s5992)
+D 2008-12-08T18:27:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -152,7 +152,7 @@ F src/random.c 67bf41b20f1983a0e481e7abb98d64704ee26884
 F src/resolve.c 4af5391d2b4c1d6c583a6805ac6660181de4545b
 F src/rowset.c 2256fa4a928f750e2f3d6fc733523034beceb1d6
 F src/select.c 1d3616e4e48f6c15a0c69bf14bc5423f31624f87
-F src/shell.c be9eeb5811d1ad6ebbf6ae8b5aa04ae1368af033
+F src/shell.c 484bddeefac9314be18d4a60d401e93848274ee8
 F src/sqlite.h.in f13b2f27265b78226240cb0d2e07f165e2110bd9
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h 7bdc5726dff17a2e92b23d478b7024c535d77a47
@@ -664,7 +664,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cf419d0b01c0144b752f4283ba9668747339b218
-R 2d222f2ecf9d24abc952681891899e82
+P 73c7302c5f76a2f61ecd75f8bda69bb500d3119c
+R e35fc03527ddf199e75a6f59bd7d841e
 U drh
-Z 730302298609f4c7f51091c009ffa471
+Z 113eac2b3090ac202a89e92fb4135418

diff --git a/manifest.uuid b/manifest.uuid
index 778cb12103d8353d0ab7091978963b9e812c935f..dc30c74b3ae7e9e379d1c676d899f0c7c4800747 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73c7302c5f76a2f61ecd75f8bda69bb500d3119c
\ No newline at end of file
+6c0b2e7579ee5504617831a5e8bb6193e283ad30
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 141b1256fd2954ff64ab7602a418538d43d534c1..43c0cab5060471b906c1f66a44ca47b6b83c0224 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.190 2008/12/05 17:17:08 drh Exp $
+** $Id: shell.c,v 1.191 2008/12/08 18:27:31 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -66,12 +66,6 @@ extern int isatty();
 #include <sys/time.h>
 #include <sys/resource.h>
 
-/*
-** Used to prevent warnings about unused parameters
-*/
-#define UNUSED_PARAMETER(x) (void)(x)
-
-
 /* Saved resource information for the beginning of an operation */
 static struct rusage sBegin;
 
@@ -114,6 +108,10 @@ static void endTimer(void){
 #define HAS_TIMER 0
 #endif
 
+/*
+** Used to prevent warnings about unused parameters
+*/
+#define UNUSED_PARAMETER(x) (void)(x)
 
 /*
 ** If the following flag is set, then command execution stops