Fossil SCM

Style cleanup (no tabs). No functional change.

andybradford 2019-09-18 14:57 trunk
Commit 89872d17d1b908cdc16414833f72e234a60c95877c5aff3f9b3a84d4cd31736f
Parent 0d5251d3eecdfc8…
4 files changed +1 -1 +2 -2 +4 -4 +5 -5
~ src/checkin.c ~ src/export.c ~ src/import.c ~ src/winhttp.c
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -2130,11 +2130,11 @@
21302130
 /* Get the ID of the parent manifest artifact */
21312131
 vid = db_lget_int("checkout", 0);
21322132
 if( vid==0 ){
21332133
 useCksum = 1;
21342134
 if( sCiInfo.zBranch==0 ) {
2135
- sCiInfo.zBranch=db_get("main-branch", "trunk");
2135
+ sCiInfo.zBranch=db_get("main-branch", "trunk");
21362136
 }
21372137
 }else if( content_is_private(vid) ){
21382138
 g.markPrivate = 1;
21392139
 }
21402140
21412141
--- src/checkin.c
+++ src/checkin.c
@@ -2130,11 +2130,11 @@
2130 /* Get the ID of the parent manifest artifact */
2131 vid = db_lget_int("checkout", 0);
2132 if( vid==0 ){
2133 useCksum = 1;
2134 if( sCiInfo.zBranch==0 ) {
2135 sCiInfo.zBranch=db_get("main-branch", "trunk");
2136 }
2137 }else if( content_is_private(vid) ){
2138 g.markPrivate = 1;
2139 }
2140
2141
--- src/checkin.c
+++ src/checkin.c
@@ -2130,11 +2130,11 @@
2130 /* Get the ID of the parent manifest artifact */
2131 vid = db_lget_int("checkout", 0);
2132 if( vid==0 ){
2133 useCksum = 1;
2134 if( sCiInfo.zBranch==0 ) {
2135 sCiInfo.zBranch=db_get("main-branch", "trunk");
2136 }
2137 }else if( content_is_private(vid) ){
2138 g.markPrivate = 1;
2139 }
2140
2141
M src/export.c
+2 -2
--- src/export.c
+++ src/export.c
@@ -170,11 +170,11 @@
170170
 free(zName);
171171
 free(zEmail);
172172
 db_reset(&q);
173173
 }
174174
175
-#define REFREPLACEMENT '_'
175
+#define REFREPLACEMENT '_'
176176
177177
 /*
178178
 ** Output a sanitized git named reference.
179179
 ** https://git-scm.com/docs/git-check-ref-format
180180
 ** This implementation assumes we are only printing
@@ -211,11 +211,11 @@
211211
 case '?':
212212
 case '*':
213213
 case '[':
214214
 case '\\':
215215
 zEncoded[w]=REFREPLACEMENT;
216
- break;
216
+ break;
217217
 }
218218
 }
219219
 /* Cannot begin with a . or / */
220220
 if( zEncoded[0]=='.' || zEncoded[0] == '/' ) zEncoded[0]=REFREPLACEMENT;
221221
 if( i>0 ){
222222
--- src/export.c
+++ src/export.c
@@ -170,11 +170,11 @@
170 free(zName);
171 free(zEmail);
172 db_reset(&q);
173 }
174
175 #define REFREPLACEMENT '_'
176
177 /*
178 ** Output a sanitized git named reference.
179 ** https://git-scm.com/docs/git-check-ref-format
180 ** This implementation assumes we are only printing
@@ -211,11 +211,11 @@
211 case '?':
212 case '*':
213 case '[':
214 case '\\':
215 zEncoded[w]=REFREPLACEMENT;
216 break;
217 }
218 }
219 /* Cannot begin with a . or / */
220 if( zEncoded[0]=='.' || zEncoded[0] == '/' ) zEncoded[0]=REFREPLACEMENT;
221 if( i>0 ){
222
--- src/export.c
+++ src/export.c
@@ -170,11 +170,11 @@
170 free(zName);
171 free(zEmail);
172 db_reset(&q);
173 }
174
175 #define REFREPLACEMENT '_'
176
177 /*
178 ** Output a sanitized git named reference.
179 ** https://git-scm.com/docs/git-check-ref-format
180 ** This implementation assumes we are only printing
@@ -211,11 +211,11 @@
211 case '?':
212 case '*':
213 case '[':
214 case '\\':
215 zEncoded[w]=REFREPLACEMENT;
216 break;
217 }
218 }
219 /* Cannot begin with a . or / */
220 if( zEncoded[0]=='.' || zEncoded[0] == '/' ) zEncoded[0]=REFREPLACEMENT;
221 if( i>0 ){
222
M src/import.c
+4 -4
--- src/import.c
+++ src/import.c
@@ -611,13 +611,13 @@
611611
 fossil_panic("short read: got %d of %d bytes", got, gg.nData);
612612
 }
613613
 gg.aData[got] = '\0';
614614
 if( gg.zComment==0 &&
615615
 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616
- /* Strip trailing newline, it's appended to the comment. */
617
- if( gg.aData[got-1] == '\n' )
618
- gg.aData[got-1] = '\0';
616
+ /* Strip trailing newline, it's appended to the comment. */
617
+ if( gg.aData[got-1] == '\n' )
618
+ gg.aData[got-1] = '\0';
619619
 gg.zComment = gg.aData;
620620
 gg.aData = 0;
621621
 gg.nData = 0;
622622
 }
623623
 }
@@ -643,11 +643,11 @@
643643
 /* Lookup user by contact info. */
644644
 fossil_free(gg.zUser);
645645
 gg.zUser = db_text(0, "SELECT login FROM user WHERE info=%Q", z);
646646
 if( gg.zUser==NULL ){
647647
 /* If there is no user with this contact info,
648
- * then use the email address as the username. */
648
+ * then use the email address as the username. */
649649
 if ( (z=strchr(z, '<'))==NULL ) goto malformed_line;
650650
 z++;
651651
 *(zTo-1) = '\0';
652652
 gg.zUser = fossil_strdup(z);
653653
 }
654654
--- src/import.c
+++ src/import.c
@@ -611,13 +611,13 @@
611 fossil_panic("short read: got %d of %d bytes", got, gg.nData);
612 }
613 gg.aData[got] = '\0';
614 if( gg.zComment==0 &&
615 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616 /* Strip trailing newline, it's appended to the comment. */
617 if( gg.aData[got-1] == '\n' )
618 gg.aData[got-1] = '\0';
619 gg.zComment = gg.aData;
620 gg.aData = 0;
621 gg.nData = 0;
622 }
623 }
@@ -643,11 +643,11 @@
643 /* Lookup user by contact info. */
644 fossil_free(gg.zUser);
645 gg.zUser = db_text(0, "SELECT login FROM user WHERE info=%Q", z);
646 if( gg.zUser==NULL ){
647 /* If there is no user with this contact info,
648 * then use the email address as the username. */
649 if ( (z=strchr(z, '<'))==NULL ) goto malformed_line;
650 z++;
651 *(zTo-1) = '\0';
652 gg.zUser = fossil_strdup(z);
653 }
654
--- src/import.c
+++ src/import.c
@@ -611,13 +611,13 @@
611 fossil_panic("short read: got %d of %d bytes", got, gg.nData);
612 }
613 gg.aData[got] = '\0';
614 if( gg.zComment==0 &&
615 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616 /* Strip trailing newline, it's appended to the comment. */
617 if( gg.aData[got-1] == '\n' )
618 gg.aData[got-1] = '\0';
619 gg.zComment = gg.aData;
620 gg.aData = 0;
621 gg.nData = 0;
622 }
623 }
@@ -643,11 +643,11 @@
643 /* Lookup user by contact info. */
644 fossil_free(gg.zUser);
645 gg.zUser = db_text(0, "SELECT login FROM user WHERE info=%Q", z);
646 if( gg.zUser==NULL ){
647 /* If there is no user with this contact info,
648 * then use the email address as the username. */
649 if ( (z=strchr(z, '<'))==NULL ) goto malformed_line;
650 z++;
651 *(zTo-1) = '\0';
652 gg.zUser = fossil_strdup(z);
653 }
654
M src/winhttp.c
+5 -5
--- src/winhttp.c
+++ src/winhttp.c
@@ -203,26 +203,26 @@
203203
 /*
204204
 ** Accepts connections on DualSocket.
205205
 */
206206
 static void DualSocket_accept(DualSocket* pListen, DualSocket* pClient,
207207
 DualAddr* pClientAddr){
208
- fd_set rs;
208
+ fd_set rs;
209209
 int rs_count = 0;
210210
 assert( pListen!=NULL && pClient!=NULL && pClientAddr!= NULL );
211211
 DualSocket_init(pClient);
212212
 DualAddr_init(pClientAddr);
213213
 FD_ZERO(&rs);
214
- if( pListen->s4!=INVALID_SOCKET ){
214
+ if( pListen->s4!=INVALID_SOCKET ){
215215
 FD_SET(pListen->s4, &rs);
216216
 ++rs_count;
217217
 }
218
- if( pListen->s6!=INVALID_SOCKET ){
218
+ if( pListen->s6!=INVALID_SOCKET ){
219219
 FD_SET(pListen->s6, &rs);
220220
 ++rs_count;
221221
 }
222
- if( select(rs_count, &rs, 0, 0, 0 /*blocking*/)==SOCKET_ERROR ){
223
- return;
222
+ if( select(rs_count, &rs, 0, 0, 0 /*blocking*/)==SOCKET_ERROR ){
223
+ return;
224224
 }
225225
 if( FD_ISSET(pListen->s4, &rs) ){
226226
 pClient->s4 = accept(pListen->s4, (struct sockaddr*)&pClientAddr->a4.addr,
227227
 &pClientAddr->a4.len);
228228
 }
229229
--- src/winhttp.c
+++ src/winhttp.c
@@ -203,26 +203,26 @@
203 /*
204 ** Accepts connections on DualSocket.
205 */
206 static void DualSocket_accept(DualSocket* pListen, DualSocket* pClient,
207 DualAddr* pClientAddr){
208 fd_set rs;
209 int rs_count = 0;
210 assert( pListen!=NULL && pClient!=NULL && pClientAddr!= NULL );
211 DualSocket_init(pClient);
212 DualAddr_init(pClientAddr);
213 FD_ZERO(&rs);
214 if( pListen->s4!=INVALID_SOCKET ){
215 FD_SET(pListen->s4, &rs);
216 ++rs_count;
217 }
218 if( pListen->s6!=INVALID_SOCKET ){
219 FD_SET(pListen->s6, &rs);
220 ++rs_count;
221 }
222 if( select(rs_count, &rs, 0, 0, 0 /*blocking*/)==SOCKET_ERROR ){
223 return;
224 }
225 if( FD_ISSET(pListen->s4, &rs) ){
226 pClient->s4 = accept(pListen->s4, (struct sockaddr*)&pClientAddr->a4.addr,
227 &pClientAddr->a4.len);
228 }
229
--- src/winhttp.c
+++ src/winhttp.c
@@ -203,26 +203,26 @@
203 /*
204 ** Accepts connections on DualSocket.
205 */
206 static void DualSocket_accept(DualSocket* pListen, DualSocket* pClient,
207 DualAddr* pClientAddr){
208 fd_set rs;
209 int rs_count = 0;
210 assert( pListen!=NULL && pClient!=NULL && pClientAddr!= NULL );
211 DualSocket_init(pClient);
212 DualAddr_init(pClientAddr);
213 FD_ZERO(&rs);
214 if( pListen->s4!=INVALID_SOCKET ){
215 FD_SET(pListen->s4, &rs);
216 ++rs_count;
217 }
218 if( pListen->s6!=INVALID_SOCKET ){
219 FD_SET(pListen->s6, &rs);
220 ++rs_count;
221 }
222 if( select(rs_count, &rs, 0, 0, 0 /*blocking*/)==SOCKET_ERROR ){
223 return;
224 }
225 if( FD_ISSET(pListen->s4, &rs) ){
226 pClient->s4 = accept(pListen->s4, (struct sockaddr*)&pClientAddr->a4.addr,
227 &pClientAddr->a4.len);
228 }
229

Keyboard Shortcuts

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