Remove surplus white space from shell.c. Use strlen30() instead of strlen(). (CVS...

FossilOrigin-Name: 324a1aff300b7349b9fc1dea56d640d86500f100

diff --git a/manifest b/manifest
index 569d7fa1d265e77dcaf7958fca69e8d89b119fb6..0a87843253e0dac33d9e6408dd30f8e2b5ce709a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\s#3719.\sWhen\ssynthesizing\sa\sCREATE\sTABLE\sstatement\sas\sas\sresult\sof\sa\s"CREATE\sTABLE\sAS",\squote\sthe\scolumn\stype\snames\sunless\sthey\sare\ssimple\sidentifiers\sor\ssimple\sidentifiers\sfollowed\sby\sone\sor\stwo\sdimensions\s(e.g.\s"VARCHAR(10)").\s(CVS\s6345)
-D 2009-03-14T08:37:24
+C Remove\ssurplus\swhite\sspace\sfrom\sshell.c.\s\sUse\sstrlen30()\sinstead\sof\sstrlen().\s(CVS\s6346)
+D 2009-03-16T10:59:44
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -155,7 +155,7 @@ F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
 F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d
 F src/rowset.c ba9375f37053d422dd76965a9c370a13b6e1aac4
 F src/select.c 4d0b77fd76ff80f09a798ee98953e344c9de8fbb
-F src/shell.c de2fef6f71c7fb52fb4066947149a0b562cc5534
+F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 14f4d065bafed8500ea558a75a8e2be89c784d61
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h ae2dc2e2a063edfae3043e725981e69855bd3c9c
@@ -704,7 +704,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 943b11fb188835f0c62b6064b084192b1bbe1c0c
-R 80daaf5cc0fe3707a03f09e098f3c65b
-U danielk1977
-Z e47d0a979c492c3c4fa5d4292c1f1fd6
+P 7c6437efe0a0e935cfa8041bd6b94070c8654fa4
+R 756b37b35f0f2927d4a7848a41dc6d2b
+U drh
+Z 1220be28d4269b584346f7986e56e912

diff --git a/manifest.uuid b/manifest.uuid
index 53c80d75ddab3738c3a19814fc9e75fd1d2ccd09..23d22b03ac25f31e6bddd64ab660cacf1e1cb1f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c6437efe0a0e935cfa8041bd6b94070c8654fa4
\ No newline at end of file
+324a1aff300b7349b9fc1dea56d640d86500f100
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 8a98357f008a3f1b2181397a9b3b6d47ff2ef429..d58f151acd70d726b8ccabff020644159ce64171 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.206 2009/03/13 15:32:53 danielk1977 Exp $
+** $Id: shell.c,v 1.207 2009/03/16 10:59:44 drh Exp $
 */
 #if defined(_WIN32) || defined(WIN32)
 /* This needs to come before any includes for MSVC compiler */
@@ -253,7 +253,6 @@ static int schemaCreate(
   SchemaTable *pType = &aSchemaTable[0];
 
   UNUSED_PARAMETER(pzErr);
-
   if( argc>3 ){
     int i;
     pType = 0;
@@ -577,7 +576,6 @@ static void doublequote(
   int nIn = sqlite3_value_bytes(argv[0]);
 
   UNUSED_PARAMETER(argc);
-
   zOut = sqlite3_malloc(nIn*2+3);
   zCsr = zOut;
   *zCsr++ = '"';
@@ -1783,7 +1781,6 @@ static int run_schema_dump_query(
   return rc;
 }
 
-
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_SUBQUERY)
 struct GenfkeyCmd {
   sqlite3 *db;                   /* Database handle */
@@ -1800,7 +1797,7 @@ static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){
   memset(p, 0, sizeof(GenfkeyCmd));
 
   for(ii=0; ii<nArg; ii++){
-    size_t n = strlen(azArg[ii]);
+    int n = strlen30(azArg[ii]);
 
     if( n>2 && n<10 && 0==strncmp(azArg[ii], "--no-drop", n) ){
       p->isNoDrop = 1;