Fossil SCM

Merge variable name change.

mistachkin 2014-06-19 03:04 experimental merge
Commit 05ea665fef89ce4acfeced9b109266e063a6fe56
Parent 816faa5af962ddc…
2 files changed +7 -7 +7 -7
~ src/comformat.c ~ src/comformat.c
M src/comformat.c
+7 -7
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
4545
 ** Return the number of newlines that are output.
4646
 */
4747
 int comment_print(const char *zText, int indent, int lineLength){
4848
 int tlen = lineLength - indent;
4949
 int len = 0, doIndent = 0, lineCnt = 0;
50
- const char *zBuf;
50
+ const char *zLine;
5151
5252
 #if defined(_WIN32)
5353
 if( lineLength<0 ){
5454
 CONSOLE_SCREEN_BUFFER_INFO csbi;
5555
 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
8585
 fossil_print("\n");
8686
 lineCnt++;
8787
 }
8888
 return lineCnt;
8989
 }
90
- zBuf = zText;
90
+ zLine = zText;
9191
 for(;;){
9292
 if( zText[0]==0 ){
9393
 if( doIndent ){
9494
 fossil_print("%*s", indent, "");
9595
 }
96
- fossil_print("%.*s", (int)(zText - zBuf), zBuf);
96
+ fossil_print("%.*s", (int)(zText - zLine), zLine);
9797
 if( fossil_force_newline() ){
9898
 lineCnt++;
9999
 }
100100
 break;
101101
 }
@@ -103,17 +103,17 @@
103103
 if( zText[0]=='\n' || len>=tlen ){
104104
 if( doIndent ){
105105
 fossil_print("%*s", indent, "");
106106
 }
107107
 doIndent = 1;
108
- while( zText>zBuf && !fossil_isspace(zText[0]) ){ zText--; }
109
- fossil_print("%.*s", (int)(zText - zBuf), zBuf);
108
+ while( zText>zLine && !fossil_isspace(zText[0]) ){ zText--; }
109
+ fossil_print("%.*s", (int)(zText - zLine), zLine);
110110
 if( fossil_force_newline() ){
111111
 lineCnt++;
112112
 }
113
- zBuf = zText;
114
- if( !zBuf++ ) break;
113
+ zLine = zText;
114
+ if( !zLine++ ) break;
115115
 len = 0;
116116
 }
117117
 zText++;
118118
 }
119119
 return lineCnt;
120120
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
45 ** Return the number of newlines that are output.
46 */
47 int comment_print(const char *zText, int indent, int lineLength){
48 int tlen = lineLength - indent;
49 int len = 0, doIndent = 0, lineCnt = 0;
50 const char *zBuf;
51
52 #if defined(_WIN32)
53 if( lineLength<0 ){
54 CONSOLE_SCREEN_BUFFER_INFO csbi;
55 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
85 fossil_print("\n");
86 lineCnt++;
87 }
88 return lineCnt;
89 }
90 zBuf = zText;
91 for(;;){
92 if( zText[0]==0 ){
93 if( doIndent ){
94 fossil_print("%*s", indent, "");
95 }
96 fossil_print("%.*s", (int)(zText - zBuf), zBuf);
97 if( fossil_force_newline() ){
98 lineCnt++;
99 }
100 break;
101 }
@@ -103,17 +103,17 @@
103 if( zText[0]=='\n' || len>=tlen ){
104 if( doIndent ){
105 fossil_print("%*s", indent, "");
106 }
107 doIndent = 1;
108 while( zText>zBuf && !fossil_isspace(zText[0]) ){ zText--; }
109 fossil_print("%.*s", (int)(zText - zBuf), zBuf);
110 if( fossil_force_newline() ){
111 lineCnt++;
112 }
113 zBuf = zText;
114 if( !zBuf++ ) break;
115 len = 0;
116 }
117 zText++;
118 }
119 return lineCnt;
120
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
45 ** Return the number of newlines that are output.
46 */
47 int comment_print(const char *zText, int indent, int lineLength){
48 int tlen = lineLength - indent;
49 int len = 0, doIndent = 0, lineCnt = 0;
50 const char *zLine;
51
52 #if defined(_WIN32)
53 if( lineLength<0 ){
54 CONSOLE_SCREEN_BUFFER_INFO csbi;
55 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
85 fossil_print("\n");
86 lineCnt++;
87 }
88 return lineCnt;
89 }
90 zLine = zText;
91 for(;;){
92 if( zText[0]==0 ){
93 if( doIndent ){
94 fossil_print("%*s", indent, "");
95 }
96 fossil_print("%.*s", (int)(zText - zLine), zLine);
97 if( fossil_force_newline() ){
98 lineCnt++;
99 }
100 break;
101 }
@@ -103,17 +103,17 @@
103 if( zText[0]=='\n' || len>=tlen ){
104 if( doIndent ){
105 fossil_print("%*s", indent, "");
106 }
107 doIndent = 1;
108 while( zText>zLine && !fossil_isspace(zText[0]) ){ zText--; }
109 fossil_print("%.*s", (int)(zText - zLine), zLine);
110 if( fossil_force_newline() ){
111 lineCnt++;
112 }
113 zLine = zText;
114 if( !zLine++ ) break;
115 len = 0;
116 }
117 zText++;
118 }
119 return lineCnt;
120
M src/comformat.c
+7 -7
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
4545
 ** Return the number of newlines that are output.
4646
 */
4747
 int comment_print(const char *zText, int indent, int lineLength){
4848
 int tlen = lineLength - indent;
4949
 int len = 0, doIndent = 0, lineCnt = 0;
50
- const char *zBuf;
50
+ const char *zLine;
5151
5252
 #if defined(_WIN32)
5353
 if( lineLength<0 ){
5454
 CONSOLE_SCREEN_BUFFER_INFO csbi;
5555
 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
8585
 fossil_print("\n");
8686
 lineCnt++;
8787
 }
8888
 return lineCnt;
8989
 }
90
- zBuf = zText;
90
+ zLine = zText;
9191
 for(;;){
9292
 if( zText[0]==0 ){
9393
 if( doIndent ){
9494
 fossil_print("%*s", indent, "");
9595
 }
96
- fossil_print("%.*s", (int)(zText - zBuf), zBuf);
96
+ fossil_print("%.*s", (int)(zText - zLine), zLine);
9797
 if( fossil_force_newline() ){
9898
 lineCnt++;
9999
 }
100100
 break;
101101
 }
@@ -103,17 +103,17 @@
103103
 if( zText[0]=='\n' || len>=tlen ){
104104
 if( doIndent ){
105105
 fossil_print("%*s", indent, "");
106106
 }
107107
 doIndent = 1;
108
- while( zText>zBuf && !fossil_isspace(zText[0]) ){ zText--; }
109
- fossil_print("%.*s", (int)(zText - zBuf), zBuf);
108
+ while( zText>zLine && !fossil_isspace(zText[0]) ){ zText--; }
109
+ fossil_print("%.*s", (int)(zText - zLine), zLine);
110110
 if( fossil_force_newline() ){
111111
 lineCnt++;
112112
 }
113
- zBuf = zText;
114
- if( !zBuf++ ) break;
113
+ zLine = zText;
114
+ if( !zLine++ ) break;
115115
 len = 0;
116116
 }
117117
 zText++;
118118
 }
119119
 return lineCnt;
120120
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
45 ** Return the number of newlines that are output.
46 */
47 int comment_print(const char *zText, int indent, int lineLength){
48 int tlen = lineLength - indent;
49 int len = 0, doIndent = 0, lineCnt = 0;
50 const char *zBuf;
51
52 #if defined(_WIN32)
53 if( lineLength<0 ){
54 CONSOLE_SCREEN_BUFFER_INFO csbi;
55 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
85 fossil_print("\n");
86 lineCnt++;
87 }
88 return lineCnt;
89 }
90 zBuf = zText;
91 for(;;){
92 if( zText[0]==0 ){
93 if( doIndent ){
94 fossil_print("%*s", indent, "");
95 }
96 fossil_print("%.*s", (int)(zText - zBuf), zBuf);
97 if( fossil_force_newline() ){
98 lineCnt++;
99 }
100 break;
101 }
@@ -103,17 +103,17 @@
103 if( zText[0]=='\n' || len>=tlen ){
104 if( doIndent ){
105 fossil_print("%*s", indent, "");
106 }
107 doIndent = 1;
108 while( zText>zBuf && !fossil_isspace(zText[0]) ){ zText--; }
109 fossil_print("%.*s", (int)(zText - zBuf), zBuf);
110 if( fossil_force_newline() ){
111 lineCnt++;
112 }
113 zBuf = zText;
114 if( !zBuf++ ) break;
115 len = 0;
116 }
117 zText++;
118 }
119 return lineCnt;
120
--- src/comformat.c
+++ src/comformat.c
@@ -45,11 +45,11 @@
45 ** Return the number of newlines that are output.
46 */
47 int comment_print(const char *zText, int indent, int lineLength){
48 int tlen = lineLength - indent;
49 int len = 0, doIndent = 0, lineCnt = 0;
50 const char *zLine;
51
52 #if defined(_WIN32)
53 if( lineLength<0 ){
54 CONSOLE_SCREEN_BUFFER_INFO csbi;
55 memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
@@ -85,17 +85,17 @@
85 fossil_print("\n");
86 lineCnt++;
87 }
88 return lineCnt;
89 }
90 zLine = zText;
91 for(;;){
92 if( zText[0]==0 ){
93 if( doIndent ){
94 fossil_print("%*s", indent, "");
95 }
96 fossil_print("%.*s", (int)(zText - zLine), zLine);
97 if( fossil_force_newline() ){
98 lineCnt++;
99 }
100 break;
101 }
@@ -103,17 +103,17 @@
103 if( zText[0]=='\n' || len>=tlen ){
104 if( doIndent ){
105 fossil_print("%*s", indent, "");
106 }
107 doIndent = 1;
108 while( zText>zLine && !fossil_isspace(zText[0]) ){ zText--; }
109 fossil_print("%.*s", (int)(zText - zLine), zLine);
110 if( fossil_force_newline() ){
111 lineCnt++;
112 }
113 zLine = zText;
114 if( !zLine++ ) break;
115 len = 0;
116 }
117 zText++;
118 }
119 return lineCnt;
120

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button