database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Correct help text and make consistent use of snprintf.

Browse Source 
FossilOrigin-Name: 9c424a5c50e4a2ed36556e99fba0e7072a2d3468
This commit is contained in:
mistachkin
2014-07-24 22:51:18 +00:00
parent 815ab5ac49
commit 22c9638efd
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Update\sa\sshell\stest\scase.
D 2014-07-24T22:33:47.040
C Correct\shelp\stext\sand\smake\sconsistent\suse\sof\ssnprintf.
D 2014-07-24T22:51:18.860
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -223,7 +223,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
F src/shell.c e1177e053e214be9c1549dac5bbcb2164b6114dd
F src/shell.c 5129214fbe720ce24802e750b1ac0a49f04034cd
F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1184,7 +1184,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 289092bb64463efe78a5f01b06b24aa664a31feb
R 2dda198fecf0d2cc936f765b01233dec
P b84008cb964f234b6a6b441f738e344158c4c92a
R 0b04208537b14ee3bcc223e1a9755bab
U mistachkin
Z 05cc0be56c34ce76332247b4a337d27f
Z 0945ca559f52609ad97025a5011e881c

2
manifest.uuid
View File

@@ -1 +1 @@
b84008cb964f234b6a6b441f738e344158c4c92a
9c424a5c50e4a2ed36556e99fba0e7072a2d3468

10
src/shell.c
View File

@@ -3225,7 +3225,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
if( c=='r' && strncmp(azArg[0], "rowseparator", n)==0 ){
if( nArg==2 ){
sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator,
"%.*s", (int)sizeof(p->rowSeparator)-1, azArg[1]);
"%.*s", (int)ArraySize(p->rowSeparator)-1, azArg[1]);
}else{
fprintf(stderr, "Usage: .rowseparator STRING\n");
rc = 1;
@@ -3235,7 +3235,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
if( c=='c' && strncmp(azArg[0], "colseparator", n)==0 ){
if( nArg==2 ){
sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
"%.*s", (int)sizeof(p->colSeparator)-1, azArg[1]);
"%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
}else{
fprintf(stderr, "Usage: .colseparator STRING\n");
rc = 1;
@@ -3249,11 +3249,11 @@ static int do_meta_command(char *zLine, struct callback_data *p){
}
if( nArg>=2 ){
sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
"%.*s", (int)sizeof(p->colSeparator)-1, azArg[1]);
"%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
}
if( nArg>=3 ){
sqlite3_snprintf(sizeof(p->newline), p->newline,
"%.*s", (int)sizeof(p->newline)-1, azArg[2]);
"%.*s", (int)ArraySize(p->newline)-1, azArg[2]);
}
}else
@@ -3900,7 +3900,7 @@ static const char zOptions[] =
" -ascii set output mode to 'ascii'\n"
" -bail stop after hitting an error\n"
" -batch force batch I/O\n"
" -colseparator SEP same as -separator with one argument\n"
" -colseparator SEP same as -separator\n"
" -column set output mode to 'column'\n"
" -cmd COMMAND run \"COMMAND\" before reading stdin\n"
" -csv set output mode to 'csv'\n"