database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

In the command line shell, avoid using utf8_printf() in a couple places where it is superfluous.

Browse Source 
FossilOrigin-Name: 6311a8bdb1f2e1813516a32d171aae030bd73fd3
This commit is contained in:
mistachkin
2016-11-11 05:19:45 +00:00
parent c5b86be7db
commit 2f9a613ced
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Add\sthe\s--raw\soption\sto\sthe\s".read"\sdot-command\sof\sthe\scommand-line\sshell,\nto\scause\sthe\snamed\sfile\sto\sbe\sread\sand\ssent\sdirectly\sinto\ssqlite3_exec()\nwithout\sany\sinterpretation. C In\sthe\scommand\sline\sshell,\savoid\susing\sutf8_printf()\sin\sa\scouple\splaces\swhere\sit\sis\ssuperfluous.
D 2016-11-11T04:37:00.671 D 2016-11-11T05:19:45.427
F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -388,7 +388,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722 F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
F src/shell.c e77c47b035e7ac79c89ca25fdb4fbc7158a86a20 F src/shell.c dd8dbdcfbbac328c9011ce70d516c6872f9bae6e
F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027 F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1530,7 +1530,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P b0ff183b8ffdbebece06cfea1c6781fc0e8e8547 P 09233770b24d69a305556241a6beeb5e4d77c0d7
R 1bc28093103f82773b6175c0eaf36791 R 5cf5e2ce8ca8e99cb9bee7725cd4410a
U drh U mistachkin
Z 12078e4f7b8e85a9a59383108eda95de Z 9c763fa2ad7418630629cdc53f5357cd

2
manifest.uuid
View File

@@ -1 +1 @@
09233770b24d69a305556241a6beeb5e4d77c0d7 6311a8bdb1f2e1813516a32d171aae030bd73fd3

10
src/shell.c
View File

@@ -1216,10 +1216,10 @@ static int shell_callback(
raw_printf(p->out," VALUES("); raw_printf(p->out," VALUES(");
}else if( p->cnt==0 && p->showHeader ){ }else if( p->cnt==0 && p->showHeader ){
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
if( i>0 ) utf8_printf(p->out, ","); if( i>0 ) raw_printf(p->out, ",");
output_quoted_string(p->out, azCol[i]); output_quoted_string(p->out, azCol[i]);
} }
utf8_printf(p->out,"\n"); raw_printf(p->out,"\n");
} }
p->cnt++; p->cnt++;
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
@@ -3916,12 +3916,12 @@ static int do_meta_command(char *zLine, ShellState *p){
utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db)); utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db));
}else{ }else{
utf8_printf(stdout, "%s;\n", zSql); utf8_printf(stdout, "%s;\n", zSql);
utf8_printf(stdout, raw_printf(stdout,
"WARNING: writing to an imposter table will corrupt the index!\n" "WARNING: writing to an imposter table will corrupt the index!\n"
); );
} }
}else{ }else{
utf8_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc); raw_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc);
rc = 1; rc = 1;
} }
sqlite3_free(zSql); sqlite3_free(zSql);
@@ -4814,7 +4814,7 @@ static int do_meta_command(char *zLine, ShellState *p){
output_reset(p); output_reset(p);
p->out = output_file_open("testcase-out.txt"); p->out = output_file_open("testcase-out.txt");
if( p->out==0 ){ if( p->out==0 ){
utf8_printf(stderr, "Error: cannot open 'testcase-out.txt'\n"); raw_printf(stderr, "Error: cannot open 'testcase-out.txt'\n");
} }
if( nArg>=2 ){ if( nArg>=2 ){
sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]); sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);