1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00

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

FossilOrigin-Name: 324a1aff300b7349b9fc1dea56d640d86500f100
This commit is contained in:
drh
2009-03-16 10:59:44 +00:00
parent 1b870de6b0
commit 93a989cf65
3 changed files with 10 additions and 13 deletions

View File

@@ -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) C Remove\ssurplus\swhite\sspace\sfrom\sshell.c.\s\sUse\sstrlen30()\sinstead\sof\sstrlen().\s(CVS\s6346)
D 2009-03-14T08:37:24 D 2009-03-16T10:59:44
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7 F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -155,7 +155,7 @@ F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d
F src/rowset.c ba9375f37053d422dd76965a9c370a13b6e1aac4 F src/rowset.c ba9375f37053d422dd76965a9c370a13b6e1aac4
F src/select.c 4d0b77fd76ff80f09a798ee98953e344c9de8fbb F src/select.c 4d0b77fd76ff80f09a798ee98953e344c9de8fbb
F src/shell.c de2fef6f71c7fb52fb4066947149a0b562cc5534 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
F src/sqlite.h.in 14f4d065bafed8500ea558a75a8e2be89c784d61 F src/sqlite.h.in 14f4d065bafed8500ea558a75a8e2be89c784d61
F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
F src/sqliteInt.h ae2dc2e2a063edfae3043e725981e69855bd3c9c F src/sqliteInt.h ae2dc2e2a063edfae3043e725981e69855bd3c9c
@@ -704,7 +704,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 943b11fb188835f0c62b6064b084192b1bbe1c0c P 7c6437efe0a0e935cfa8041bd6b94070c8654fa4
R 80daaf5cc0fe3707a03f09e098f3c65b R 756b37b35f0f2927d4a7848a41dc6d2b
U danielk1977 U drh
Z e47d0a979c492c3c4fa5d4292c1f1fd6 Z 1220be28d4269b584346f7986e56e912

View File

@@ -1 +1 @@
7c6437efe0a0e935cfa8041bd6b94070c8654fa4 324a1aff300b7349b9fc1dea56d640d86500f100

View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line ** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases. ** 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) #if defined(_WIN32) || defined(WIN32)
/* This needs to come before any includes for MSVC compiler */ /* This needs to come before any includes for MSVC compiler */
@@ -253,7 +253,6 @@ static int schemaCreate(
SchemaTable *pType = &aSchemaTable[0]; SchemaTable *pType = &aSchemaTable[0];
UNUSED_PARAMETER(pzErr); UNUSED_PARAMETER(pzErr);
if( argc>3 ){ if( argc>3 ){
int i; int i;
pType = 0; pType = 0;
@@ -577,7 +576,6 @@ static void doublequote(
int nIn = sqlite3_value_bytes(argv[0]); int nIn = sqlite3_value_bytes(argv[0]);
UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argc);
zOut = sqlite3_malloc(nIn*2+3); zOut = sqlite3_malloc(nIn*2+3);
zCsr = zOut; zCsr = zOut;
*zCsr++ = '"'; *zCsr++ = '"';
@@ -1783,7 +1781,6 @@ static int run_schema_dump_query(
return rc; return rc;
} }
#if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_SUBQUERY) #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_SUBQUERY)
struct GenfkeyCmd { struct GenfkeyCmd {
sqlite3 *db; /* Database handle */ sqlite3 *db; /* Database handle */
@@ -1800,7 +1797,7 @@ static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){
memset(p, 0, sizeof(GenfkeyCmd)); memset(p, 0, sizeof(GenfkeyCmd));
for(ii=0; ii<nArg; ii++){ 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) ){ if( n>2 && n<10 && 0==strncmp(azArg[ii], "--no-drop", n) ){
p->isNoDrop = 1; p->isNoDrop = 1;