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

Rename a structure member to improve code clarity.

Browse Source 
FossilOrigin-Name: d48eda16ef8a84a93de9c6f38f794aceb4a6ba0d
This commit is contained in:
mistachkin
2014-12-11 03:29:14 +00:00
parent 44ca920625
commit 44b99f7e2e
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Remove\san\sunused\sstructure\smember. C Rename\sa\sstructure\smember\sto\simprove\scode\sclarity.
D 2014-12-11T03:25:05.862 D 2014-12-11T03:29:14.206
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809 F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -229,7 +229,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75 F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
F src/shell.c d2c9565c39b74fbbafc5e298f46a5dce2712633a F src/shell.c 3628fab3fba6490bebba7fa63989c5c410eba0a5
F src/sqlite.h.in 2e699aabd1df6042aff4265cd93bdc8812629f11 F src/sqlite.h.in 2e699aabd1df6042aff4265cd93bdc8812629f11
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -1227,7 +1227,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P cf9c6e7eea4cab073e608e6fefdd24be87a8abeb P d8404340cb01af440feebd19d291eb7198cfa576
R ddc1d3f4245eaeea9a8356078a1ff2c8 R 46f56278d908459d592a073dfada5d9c
U mistachkin U mistachkin
Z 68f03e9f12ac1359ea66745b2be1a192 Z d954c642e1623a1d799298570f596d90

2
manifest.uuid
View File

@@ -1 +1 @@
d8404340cb01af440feebd19d291eb7198cfa576 d48eda16ef8a84a93de9c6f38f794aceb4a6ba0d

30
src/shell.c
View File

@@ -475,7 +475,7 @@ struct ShellState {
char rowSeparator[20]; /* Row separator character for MODE_Ascii */ char rowSeparator[20]; /* Row separator character for MODE_Ascii */
int colWidth[100]; /* Requested width of each column when in column mode*/ int colWidth[100]; /* Requested width of each column when in column mode*/
int actualWidth[100]; /* Actual width of each column */ int actualWidth[100]; /* Actual width of each column */
char nullvalue[20]; /* The text to print when a NULL comes back from char nullValue[20]; /* The text to print when a NULL comes back from
** the database */ ** the database */
SavedModeInfo normalMode;/* Holds the mode just before .explain ON */ SavedModeInfo normalMode;/* Holds the mode just before .explain ON */
char outfile[FILENAME_MAX]; /* Filename for *out */ char outfile[FILENAME_MAX]; /* Filename for *out */
@@ -693,14 +693,14 @@ static const char needCsvQuote[] = {
/* /*
** Output a single term of CSV. Actually, p->separator is used for ** Output a single term of CSV. Actually, p->separator is used for
** the separator, which may or may not be a comma. p->nullvalue is ** the separator, which may or may not be a comma. p->nullValue is
** the null value. Strings are quoted if necessary. The separator ** the null value. Strings are quoted if necessary. The separator
** is only issued if bSep is true. ** is only issued if bSep is true.
*/ */
static void output_csv(ShellState *p, const char *z, int bSep){ static void output_csv(ShellState *p, const char *z, int bSep){
FILE *out = p->out; FILE *out = p->out;
if( z==0 ){ if( z==0 ){
fprintf(out,"%s",p->nullvalue); fprintf(out,"%s",p->nullValue);
}else{ }else{
int i; int i;
int nSep = strlen30(p->colSeparator); int nSep = strlen30(p->colSeparator);
@@ -765,7 +765,7 @@ static int shell_callback(
if( p->cnt++>0 ) fprintf(p->out, "%s", p->rowSeparator); if( p->cnt++>0 ) fprintf(p->out, "%s", p->rowSeparator);
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
fprintf(p->out,"%*s = %s%s", w, azCol[i], fprintf(p->out,"%*s = %s%s", w, azCol[i],
azArg[i] ? azArg[i] : p->nullvalue, p->rowSeparator); azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator);
} }
break; break;
} }
@@ -782,7 +782,7 @@ static int shell_callback(
if( w==0 ){ if( w==0 ){
w = strlen30(azCol[i] ? azCol[i] : ""); w = strlen30(azCol[i] ? azCol[i] : "");
if( w<10 ) w = 10; if( w<10 ) w = 10;
n = strlen30(azArg && azArg[i] ? azArg[i] : p->nullvalue); n = strlen30(azArg && azArg[i] ? azArg[i] : p->nullValue);
if( w<n ) w = n; if( w<n ) w = n;
} }
if( i<ArraySize(p->actualWidth) ){ if( i<ArraySize(p->actualWidth) ){
@@ -832,11 +832,11 @@ static int shell_callback(
} }
if( w<0 ){ if( w<0 ){
fprintf(p->out,"%*.*s%s",-w,-w, fprintf(p->out,"%*.*s%s",-w,-w,
azArg[i] ? azArg[i] : p->nullvalue, azArg[i] ? azArg[i] : p->nullValue,
i==nArg-1 ? p->rowSeparator : " "); i==nArg-1 ? p->rowSeparator : " ");
}else{ }else{
fprintf(p->out,"%-*.*s%s",w,w, fprintf(p->out,"%-*.*s%s",w,w,
azArg[i] ? azArg[i] : p->nullvalue, azArg[i] ? azArg[i] : p->nullValue,
i==nArg-1 ? p->rowSeparator : " "); i==nArg-1 ? p->rowSeparator : " ");
} }
} }
@@ -853,7 +853,7 @@ static int shell_callback(
if( azArg==0 ) break; if( azArg==0 ) break;
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
char *z = azArg[i]; char *z = azArg[i];
if( z==0 ) z = p->nullvalue; if( z==0 ) z = p->nullValue;
fprintf(p->out, "%s", z); fprintf(p->out, "%s", z);
if( i<nArg-1 ){ if( i<nArg-1 ){
fprintf(p->out, "%s", p->colSeparator); fprintf(p->out, "%s", p->colSeparator);
@@ -879,7 +879,7 @@ static int shell_callback(
fprintf(p->out,"<TR>"); fprintf(p->out,"<TR>");
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
fprintf(p->out,"<TD>"); fprintf(p->out,"<TD>");
output_html_string(p->out, azArg[i] ? azArg[i] : p->nullvalue); output_html_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
fprintf(p->out,"</TD>\n"); fprintf(p->out,"</TD>\n");
} }
fprintf(p->out,"</TR>\n"); fprintf(p->out,"</TR>\n");
@@ -895,7 +895,7 @@ static int shell_callback(
} }
if( azArg==0 ) break; if( azArg==0 ) break;
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
output_c_string(p->out, azArg[i] ? azArg[i] : p->nullvalue); output_c_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
if(i<nArg-1) fprintf(p->out, "%s", p->colSeparator); if(i<nArg-1) fprintf(p->out, "%s", p->colSeparator);
} }
fprintf(p->out, "%s", p->rowSeparator); fprintf(p->out, "%s", p->rowSeparator);
@@ -964,7 +964,7 @@ static int shell_callback(
if( azArg==0 ) break; if( azArg==0 ) break;
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
if( i>0 ) fprintf(p->out, "%s", p->colSeparator); if( i>0 ) fprintf(p->out, "%s", p->colSeparator);
fprintf(p->out,"%s",azArg[i] ? azArg[i] : p->nullvalue); fprintf(p->out,"%s",azArg[i] ? azArg[i] : p->nullValue);
} }
fprintf(p->out, "%s", p->rowSeparator); fprintf(p->out, "%s", p->rowSeparator);
break; break;
@@ -3051,8 +3051,8 @@ static int do_meta_command(char *zLine, ShellState *p){
if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){ if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
if( nArg==2 ){ if( nArg==2 ){
sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue, sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
"%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]); "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
}else{ }else{
fprintf(stderr, "Usage: .nullvalue STRING\n"); fprintf(stderr, "Usage: .nullvalue STRING\n");
rc = 1; rc = 1;
@@ -3383,7 +3383,7 @@ static int do_meta_command(char *zLine, ShellState *p){
fprintf(p->out,"%12.12s: %s\n","headers", p->showHeader ? "on" : "off"); fprintf(p->out,"%12.12s: %s\n","headers", p->showHeader ? "on" : "off");
fprintf(p->out,"%12.12s: %s\n","mode", modeDescr[p->mode]); fprintf(p->out,"%12.12s: %s\n","mode", modeDescr[p->mode]);
fprintf(p->out,"%12.12s: ", "nullvalue"); fprintf(p->out,"%12.12s: ", "nullvalue");
output_c_string(p->out, p->nullvalue); output_c_string(p->out, p->nullValue);
fprintf(p->out, "\n"); fprintf(p->out, "\n");
fprintf(p->out,"%12.12s: %s\n","output", fprintf(p->out,"%12.12s: %s\n","output",
strlen30(p->outfile) ? p->outfile : "stdout"); strlen30(p->outfile) ? p->outfile : "stdout");
@@ -4362,7 +4362,7 @@ int main(int argc, char **argv){
sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
"%s",cmdline_option_value(argc,argv,++i)); "%s",cmdline_option_value(argc,argv,++i));
}else if( strcmp(z,"-nullvalue")==0 ){ }else if( strcmp(z,"-nullvalue")==0 ){
sqlite3_snprintf(sizeof(data.nullvalue), data.nullvalue, sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
"%s",cmdline_option_value(argc,argv,++i)); "%s",cmdline_option_value(argc,argv,++i));
}else if( strcmp(z,"-header")==0 ){ }else if( strcmp(z,"-header")==0 ){
data.showHeader = 1; data.showHeader = 1;