Fix harmless compiler warnings in the shell.

FossilOrigin-Name: 9e2c17c5358b156b588542dbba38da7fedf5302b

diff --git a/manifest b/manifest
index 6f03cc1e01544164de45df22fb6c07627f6c219b..03025b6aed042703dd1ae1fe6f2fb106ba36f124 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sOGC\sGeoPackage\sfiles\sto\sthe\smagic.txt\sdatabase.
-D 2013-05-23T20:52:16.211
+C Fix\sharmless\scompiler\swarnings\sin\sthe\sshell.
+D 2013-05-24T11:57:50.209
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
-F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
+F src/shell.c 9a18124ff209ca308d786c99a466e8e270193ff3
 F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
@@ -1066,7 +1066,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 82ad373f85aa0a87d24c6dbb2ea7dca8c5aff56a
-R b8114ddabfd98673e6d6ce93a982165c
+P dab6a32847ce17f12e3a2b09a3567945b2154f67
+R 659d4081538710ab3b6917b836242fc7
 U drh
-Z 6c60065be51b126d35afa515cb8ed58f
+Z b1f0db700bf1651929699f229849ec18

diff --git a/manifest.uuid b/manifest.uuid
index d3fd55b00fbf4800a1660cf827dde3a6f857b3f5..acce33da73656fb7b25766a65bf69b90245ae810 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dab6a32847ce17f12e3a2b09a3567945b2154f67
\ No newline at end of file
+9e2c17c5358b156b588542dbba38da7fedf5302b
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 1be2871fed9a1fdf1df7198e11253600ecba76cc..d5fa9c6963d9b059f672113b77010bdfb0486282 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1564,11 +1564,11 @@ static sqlite3_int64 integerValue(const char *zArg){
   }else if( zArg[0]=='+' ){
     zArg++;
   }
-  while( isdigit(zArg[0]) ){
+  while( IsDigit(zArg[0]) ){
     v = v*10 + zArg[0] - '0';
     zArg++;
   }
-  for(i=0; i<sizeof(aMult)/sizeof(aMult[0]); i++){
+  for(i=0; i<ArraySize(aMult); i++){
     if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
       v *= aMult[i].iMult;
       break;