From: mistachkin Date: Thu, 11 Dec 2014 03:20:58 +0000 (+0000) Subject: Further simplify shell mode changes. X-Git-Tag: version-3.8.8~17^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1f84a6ec1cffaaf7a78608deca8607b6dc942d6;p=thirdparty%2Fsqlite.git Further simplify shell mode changes. FossilOrigin-Name: cf9c6e7eea4cab073e608e6fefdd24be87a8abeb --- diff --git a/manifest b/manifest index 2a02591071..498be7827e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplify\sand\scleanup\sthe\simplementation\sof\sthe\snew\sASCII\smode\sfor\sthe\sshell. -D 2014-12-11T03:12:33.799 +C Further\ssimplify\sshell\smode\schanges. +D 2014-12-11T03:20:58.752 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -229,7 +229,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75 -F src/shell.c 84359f80c432f8b34f0af4fdee8055c9fc2639a2 +F src/shell.c 4649c6bdfcc72cebffa770f9a47d37b8a9120215 F src/sqlite.h.in 2e699aabd1df6042aff4265cd93bdc8812629f11 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d @@ -1227,7 +1227,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5b5d3e4d0d158594c0db05ddbf4d926b65825042 -R 7df644943b04f66f737e7f900957f44a +P 66a28f7abaeaf1ebe6e43d856af88ac64b1ff230 +R 96c15ebe6218f037cbb3aa3c87063a4c U mistachkin -Z bc502efd9af4cfe5719e73721b9180f9 +Z 166f8db90bdd2987f2d3879c9c0b3446 diff --git a/manifest.uuid b/manifest.uuid index 7be32cae90..edf02da4cf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -66a28f7abaeaf1ebe6e43d856af88ac64b1ff230 \ No newline at end of file +cf9c6e7eea4cab073e608e6fefdd24be87a8abeb \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index c1d8f18333..a363d79bfa 100644 --- a/src/shell.c +++ b/src/shell.c @@ -3029,7 +3029,6 @@ static int do_meta_command(char *zLine, ShellState *p){ }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){ p->mode = MODE_Tcl; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space); - sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){ p->mode = MODE_Csv; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma); @@ -3037,7 +3036,6 @@ static int do_meta_command(char *zLine, ShellState *p){ }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){ p->mode = MODE_List; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab); - sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){ p->mode = MODE_Insert; set_table_name(p, nArg>=3 ? azArg[2] : "table");