Fossil SCM

Remove unnecessary end-of-line spacing

jan.nijtmans 2015-04-27 19:27 trunk
Commit fc3d9f52ee54e29293046c530fbe697edbdced48
Parent 7ab03289eeeb94d…
6 files changed +1 -1 +3 -3 +1 -1 +1 -1 +3 -3 +6 -6
~ src/browse.c ~ src/checkin.c ~ src/descendants.c ~ src/leaf.c ~ src/pivot.c ~ src/popen.c
M src/browse.c
+1 -1
--- src/browse.c
+++ src/browse.c
@@ -1002,11 +1002,11 @@
10021002
10031003
 /*
10041004
 ** WEBPAGE: fileage
10051005
 **
10061006
 ** Show all files in a single check-in (identified by the name= query
1007
-** parameter) in order of increasing age.
1007
+** parameter) in order of increasing age.
10081008
 **
10091009
 ** Parameters:
10101010
 ** name=VERSION Selects the check-in version (default=tip).
10111011
 ** glob=STRING Only shows files matching this glob pattern
10121012
 ** (e.g. *.c or *.txt).
10131013
--- src/browse.c
+++ src/browse.c
@@ -1002,11 +1002,11 @@
1002
1003 /*
1004 ** WEBPAGE: fileage
1005 **
1006 ** Show all files in a single check-in (identified by the name= query
1007 ** parameter) in order of increasing age.
1008 **
1009 ** Parameters:
1010 ** name=VERSION Selects the check-in version (default=tip).
1011 ** glob=STRING Only shows files matching this glob pattern
1012 ** (e.g. *.c or *.txt).
1013
--- src/browse.c
+++ src/browse.c
@@ -1002,11 +1002,11 @@
1002
1003 /*
1004 ** WEBPAGE: fileage
1005 **
1006 ** Show all files in a single check-in (identified by the name= query
1007 ** parameter) in order of increasing age.
1008 **
1009 ** Parameters:
1010 ** name=VERSION Selects the check-in version (default=tip).
1011 ** glob=STRING Only shows files matching this glob pattern
1012 ** (e.g. *.c or *.txt).
1013
M src/checkin.c
+3 -3
--- src/checkin.c
+++ src/checkin.c
@@ -273,11 +273,11 @@
273273
 ** Take care of -r version of ls command
274274
 */
275275
 static void ls_cmd_rev(
276276
 const char *zRev, /* Revision string given */
277277
 int verboseFlag, /* Verbose flag given */
278
- int showAge, /* Age flag given */
278
+ int showAge, /* Age flag given */
279279
 int timeOrder /* Order by time flag given */
280280
 ){
281281
 Stmt q;
282282
 char *zOrderBy = "pathname COLLATE nocase";
283283
 char *zName;
@@ -309,11 +309,11 @@
309309
310310
 rid = symbolic_name_to_rid(zRev, "ci");
311311
 if( rid==0 ){
312312
 fossil_fatal("not a valid check-in: %s", zRev);
313313
 }
314
-
314
+
315315
 if( timeOrder ){
316316
 zOrderBy = "mtime DESC";
317317
 }
318318
319319
 compute_fileage(rid,0);
@@ -334,11 +334,11 @@
334334
 fossil_print("%s %7d %s\n", zTime, size, zFile);
335335
 }else if( showAge ){
336336
 fossil_print("%s %s\n", zTime, zFile);
337337
 }else{
338338
 fossil_print("%s\n", zFile);
339
- }
339
+ }
340340
 }
341341
 db_finalize(&q);
342342
 }
343343
344344
 /*
345345
--- src/checkin.c
+++ src/checkin.c
@@ -273,11 +273,11 @@
273 ** Take care of -r version of ls command
274 */
275 static void ls_cmd_rev(
276 const char *zRev, /* Revision string given */
277 int verboseFlag, /* Verbose flag given */
278 int showAge, /* Age flag given */
279 int timeOrder /* Order by time flag given */
280 ){
281 Stmt q;
282 char *zOrderBy = "pathname COLLATE nocase";
283 char *zName;
@@ -309,11 +309,11 @@
309
310 rid = symbolic_name_to_rid(zRev, "ci");
311 if( rid==0 ){
312 fossil_fatal("not a valid check-in: %s", zRev);
313 }
314
315 if( timeOrder ){
316 zOrderBy = "mtime DESC";
317 }
318
319 compute_fileage(rid,0);
@@ -334,11 +334,11 @@
334 fossil_print("%s %7d %s\n", zTime, size, zFile);
335 }else if( showAge ){
336 fossil_print("%s %s\n", zTime, zFile);
337 }else{
338 fossil_print("%s\n", zFile);
339 }
340 }
341 db_finalize(&q);
342 }
343
344 /*
345
--- src/checkin.c
+++ src/checkin.c
@@ -273,11 +273,11 @@
273 ** Take care of -r version of ls command
274 */
275 static void ls_cmd_rev(
276 const char *zRev, /* Revision string given */
277 int verboseFlag, /* Verbose flag given */
278 int showAge, /* Age flag given */
279 int timeOrder /* Order by time flag given */
280 ){
281 Stmt q;
282 char *zOrderBy = "pathname COLLATE nocase";
283 char *zName;
@@ -309,11 +309,11 @@
309
310 rid = symbolic_name_to_rid(zRev, "ci");
311 if( rid==0 ){
312 fossil_fatal("not a valid check-in: %s", zRev);
313 }
314
315 if( timeOrder ){
316 zOrderBy = "mtime DESC";
317 }
318
319 compute_fileage(rid,0);
@@ -334,11 +334,11 @@
334 fossil_print("%s %7d %s\n", zTime, size, zFile);
335 }else if( showAge ){
336 fossil_print("%s %s\n", zTime, zFile);
337 }else{
338 fossil_print("%s\n", zFile);
339 }
340 }
341 db_finalize(&q);
342 }
343
344 /*
345
M src/descendants.c
+1 -1
--- src/descendants.c
+++ src/descendants.c
@@ -393,11 +393,11 @@
393393
394394
 if( recomputeFlag ) leaf_rebuild();
395395
 blob_zero(&sql);
396396
 blob_append(&sql, timeline_query_for_tty(), -1);
397397
 if( !multipleFlag ){
398
- /* The usual case - show all leaves */
398
+ /* The usual case - show all leaves */
399399
 blob_append_sql(&sql, " AND blob.rid IN leaf");
400400
 }else{
401401
 /* Show only leaves where two are more occur in the same branch */
402402
 db_multi_exec(
403403
 "CREATE TEMP TABLE openLeaf(rid INTEGER PRIMARY KEY);"
404404
--- src/descendants.c
+++ src/descendants.c
@@ -393,11 +393,11 @@
393
394 if( recomputeFlag ) leaf_rebuild();
395 blob_zero(&sql);
396 blob_append(&sql, timeline_query_for_tty(), -1);
397 if( !multipleFlag ){
398 /* The usual case - show all leaves */
399 blob_append_sql(&sql, " AND blob.rid IN leaf");
400 }else{
401 /* Show only leaves where two are more occur in the same branch */
402 db_multi_exec(
403 "CREATE TEMP TABLE openLeaf(rid INTEGER PRIMARY KEY);"
404
--- src/descendants.c
+++ src/descendants.c
@@ -393,11 +393,11 @@
393
394 if( recomputeFlag ) leaf_rebuild();
395 blob_zero(&sql);
396 blob_append(&sql, timeline_query_for_tty(), -1);
397 if( !multipleFlag ){
398 /* The usual case - show all leaves */
399 blob_append_sql(&sql, " AND blob.rid IN leaf");
400 }else{
401 /* Show only leaves where two are more occur in the same branch */
402 db_multi_exec(
403 "CREATE TEMP TABLE openLeaf(rid INTEGER PRIMARY KEY);"
404
M src/leaf.c
+1 -1
--- src/leaf.c
+++ src/leaf.c
@@ -194,11 +194,11 @@
194194
 int rc; /* Result */
195195
 char zVal[30];
196196
 if( !is_a_leaf(rid) ) return 0;
197197
 sqlite3_snprintf(sizeof(zVal), zVal, "%d", rid);
198198
 rc = db_exists(
199
- "SELECT 1 FROM leaf"
199
+ "SELECT 1 FROM leaf"
200200
 " WHERE NOT %z"
201201
 " AND rid<>%d"
202202
 " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=leaf.rid)="
203203
 " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)"
204204
 " AND NOT %z",
205205
--- src/leaf.c
+++ src/leaf.c
@@ -194,11 +194,11 @@
194 int rc; /* Result */
195 char zVal[30];
196 if( !is_a_leaf(rid) ) return 0;
197 sqlite3_snprintf(sizeof(zVal), zVal, "%d", rid);
198 rc = db_exists(
199 "SELECT 1 FROM leaf"
200 " WHERE NOT %z"
201 " AND rid<>%d"
202 " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=leaf.rid)="
203 " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)"
204 " AND NOT %z",
205
--- src/leaf.c
+++ src/leaf.c
@@ -194,11 +194,11 @@
194 int rc; /* Result */
195 char zVal[30];
196 if( !is_a_leaf(rid) ) return 0;
197 sqlite3_snprintf(sizeof(zVal), zVal, "%d", rid);
198 rc = db_exists(
199 "SELECT 1 FROM leaf"
200 " WHERE NOT %z"
201 " AND rid<>%d"
202 " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=leaf.rid)="
203 " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)"
204 " AND NOT %z",
205
M src/pivot.c
+3 -3
--- src/pivot.c
+++ src/pivot.c
@@ -48,11 +48,11 @@
4848
 "DELETE FROM aqueue;"
4949
 "CREATE INDEX IF NOT EXISTS aqueue_idx1 ON aqueue(pending, mtime);"
5050
 );
5151
5252
 /* Insert the primary record */
53
- db_multi_exec(
53
+ db_multi_exec(
5454
 "INSERT INTO aqueue(rid, mtime, pending, src)"
5555
 " SELECT %d, mtime, 1, 1 FROM event WHERE objid=%d AND type='ci' LIMIT 1",
5656
 rid, rid
5757
 );
5858
 }
@@ -62,11 +62,11 @@
6262
 ** must be at least one secondary but there can be more than one if
6363
 ** desired.
6464
 */
6565
 void pivot_set_secondary(int rid){
6666
 /* Insert the primary record */
67
- db_multi_exec(
67
+ db_multi_exec(
6868
 "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
6969
 " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'",
7070
 rid, rid
7171
 );
7272
 }
@@ -77,11 +77,11 @@
7777
 ** can be found.
7878
 */
7979
 int pivot_find(void){
8080
 Stmt q1, q2, u1, i1;
8181
 int rid = 0;
82
-
82
+
8383
 /* aqueue must contain at least one primary and one other. Otherwise
8484
 ** we abort early
8585
 */
8686
 if( db_int(0, "SELECT count(distinct src) FROM aqueue")<2 ){
8787
 fossil_fatal("lack both primary and secondary files");
8888
--- src/pivot.c
+++ src/pivot.c
@@ -48,11 +48,11 @@
48 "DELETE FROM aqueue;"
49 "CREATE INDEX IF NOT EXISTS aqueue_idx1 ON aqueue(pending, mtime);"
50 );
51
52 /* Insert the primary record */
53 db_multi_exec(
54 "INSERT INTO aqueue(rid, mtime, pending, src)"
55 " SELECT %d, mtime, 1, 1 FROM event WHERE objid=%d AND type='ci' LIMIT 1",
56 rid, rid
57 );
58 }
@@ -62,11 +62,11 @@
62 ** must be at least one secondary but there can be more than one if
63 ** desired.
64 */
65 void pivot_set_secondary(int rid){
66 /* Insert the primary record */
67 db_multi_exec(
68 "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
69 " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'",
70 rid, rid
71 );
72 }
@@ -77,11 +77,11 @@
77 ** can be found.
78 */
79 int pivot_find(void){
80 Stmt q1, q2, u1, i1;
81 int rid = 0;
82
83 /* aqueue must contain at least one primary and one other. Otherwise
84 ** we abort early
85 */
86 if( db_int(0, "SELECT count(distinct src) FROM aqueue")<2 ){
87 fossil_fatal("lack both primary and secondary files");
88
--- src/pivot.c
+++ src/pivot.c
@@ -48,11 +48,11 @@
48 "DELETE FROM aqueue;"
49 "CREATE INDEX IF NOT EXISTS aqueue_idx1 ON aqueue(pending, mtime);"
50 );
51
52 /* Insert the primary record */
53 db_multi_exec(
54 "INSERT INTO aqueue(rid, mtime, pending, src)"
55 " SELECT %d, mtime, 1, 1 FROM event WHERE objid=%d AND type='ci' LIMIT 1",
56 rid, rid
57 );
58 }
@@ -62,11 +62,11 @@
62 ** must be at least one secondary but there can be more than one if
63 ** desired.
64 */
65 void pivot_set_secondary(int rid){
66 /* Insert the primary record */
67 db_multi_exec(
68 "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
69 " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'",
70 rid, rid
71 );
72 }
@@ -77,11 +77,11 @@
77 ** can be found.
78 */
79 int pivot_find(void){
80 Stmt q1, q2, u1, i1;
81 int rid = 0;
82
83 /* aqueue must contain at least one primary and one other. Otherwise
84 ** we abort early
85 */
86 if( db_int(0, "SELECT count(distinct src) FROM aqueue")<2 ){
87 fossil_fatal("lack both primary and secondary files");
88
M src/popen.c
+6 -6
--- src/popen.c
+++ src/popen.c
@@ -38,11 +38,11 @@
3838
 ** The following macros are used to cast pointers to integers and
3939
 ** integers to pointers. The way you do this varies from one compiler
4040
 ** to the next, so we have developed the following set of #if statements
4141
 ** to generate appropriate macros for a wide range of compilers.
4242
 **
43
-** The correct "ANSI" way to do this is to use the intptr_t type.
43
+** The correct "ANSI" way to do this is to use the intptr_t type.
4444
 ** Unfortunately, that typedef is not available on all compilers, or
4545
 ** if it is available, it requires an #include of specific headers
4646
 ** that vary from one machine to the next.
4747
 **
4848
 ** This code is copied out of SQLite.
@@ -112,11 +112,11 @@
112112
 }
113113
 #endif
114114
115115
 /*
116116
 ** Create a child process running shell command "zCmd". *ppOut is
117
-** a FILE that becomes the standard input of the child process.
117
+** a FILE that becomes the standard input of the child process.
118118
 ** (The caller writes to *ppOut in order to send text to the child.)
119119
 ** *ppIn is stdout from the child process. (The caller
120120
 ** reads from *ppIn in order to receive input from the child.)
121121
 ** Note that *ppIn is an unbuffered file descriptor, not a FILE.
122122
 ** The process ID of the child is written into *pChildPid.
@@ -124,17 +124,17 @@
124124
 ** Return the number of errors.
125125
 */
126126
 int popen2(const char *zCmd, int *pfdIn, FILE **ppOut, int *pChildPid){
127127
 #ifdef _WIN32
128128
 HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
129
- SECURITY_ATTRIBUTES saAttr;
129
+ SECURITY_ATTRIBUTES saAttr;
130130
 DWORD childPid = 0;
131131
 int fd;
132132
133133
 saAttr.nLength = sizeof(saAttr);
134134
 saAttr.bInheritHandle = TRUE;
135
- saAttr.lpSecurityDescriptor = NULL;
135
+ saAttr.lpSecurityDescriptor = NULL;
136136
 hStderr = GetStdHandle(STD_ERROR_HANDLE);
137137
 if( !CreatePipe(&hStdoutRd, &hStdoutWr, &saAttr, 4096) ){
138138
 win32_fatal_error("cannot create pipe for stdout");
139139
 }
140140
 SetHandleInformation( hStdoutRd, HANDLE_FLAG_INHERIT, FALSE);
@@ -141,18 +141,18 @@
141141
142142
 if( !CreatePipe(&hStdinRd, &hStdinWr, &saAttr, 4096) ){
143143
 win32_fatal_error("cannot create pipe for stdin");
144144
 }
145145
 SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
146
-
146
+
147147
 win32_create_child_process(fossil_utf8_to_unicode(zCmd),
148148
 hStdinRd, hStdoutWr, hStderr,&childPid);
149149
 *pChildPid = childPid;
150150
 *pfdIn = _open_osfhandle(PTR_TO_INT(hStdoutRd), 0);
151151
 fd = _open_osfhandle(PTR_TO_INT(hStdinWr), 0);
152152
 *ppOut = _fdopen(fd, "w");
153
- CloseHandle(hStdinRd);
153
+ CloseHandle(hStdinRd);
154154
 CloseHandle(hStdoutWr);
155155
 return 0;
156156
 #else
157157
 int pin[2], pout[2];
158158
 *pfdIn = 0;
159159
--- src/popen.c
+++ src/popen.c
@@ -38,11 +38,11 @@
38 ** The following macros are used to cast pointers to integers and
39 ** integers to pointers. The way you do this varies from one compiler
40 ** to the next, so we have developed the following set of #if statements
41 ** to generate appropriate macros for a wide range of compilers.
42 **
43 ** The correct "ANSI" way to do this is to use the intptr_t type.
44 ** Unfortunately, that typedef is not available on all compilers, or
45 ** if it is available, it requires an #include of specific headers
46 ** that vary from one machine to the next.
47 **
48 ** This code is copied out of SQLite.
@@ -112,11 +112,11 @@
112 }
113 #endif
114
115 /*
116 ** Create a child process running shell command "zCmd". *ppOut is
117 ** a FILE that becomes the standard input of the child process.
118 ** (The caller writes to *ppOut in order to send text to the child.)
119 ** *ppIn is stdout from the child process. (The caller
120 ** reads from *ppIn in order to receive input from the child.)
121 ** Note that *ppIn is an unbuffered file descriptor, not a FILE.
122 ** The process ID of the child is written into *pChildPid.
@@ -124,17 +124,17 @@
124 ** Return the number of errors.
125 */
126 int popen2(const char *zCmd, int *pfdIn, FILE **ppOut, int *pChildPid){
127 #ifdef _WIN32
128 HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
129 SECURITY_ATTRIBUTES saAttr;
130 DWORD childPid = 0;
131 int fd;
132
133 saAttr.nLength = sizeof(saAttr);
134 saAttr.bInheritHandle = TRUE;
135 saAttr.lpSecurityDescriptor = NULL;
136 hStderr = GetStdHandle(STD_ERROR_HANDLE);
137 if( !CreatePipe(&hStdoutRd, &hStdoutWr, &saAttr, 4096) ){
138 win32_fatal_error("cannot create pipe for stdout");
139 }
140 SetHandleInformation( hStdoutRd, HANDLE_FLAG_INHERIT, FALSE);
@@ -141,18 +141,18 @@
141
142 if( !CreatePipe(&hStdinRd, &hStdinWr, &saAttr, 4096) ){
143 win32_fatal_error("cannot create pipe for stdin");
144 }
145 SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
146
147 win32_create_child_process(fossil_utf8_to_unicode(zCmd),
148 hStdinRd, hStdoutWr, hStderr,&childPid);
149 *pChildPid = childPid;
150 *pfdIn = _open_osfhandle(PTR_TO_INT(hStdoutRd), 0);
151 fd = _open_osfhandle(PTR_TO_INT(hStdinWr), 0);
152 *ppOut = _fdopen(fd, "w");
153 CloseHandle(hStdinRd);
154 CloseHandle(hStdoutWr);
155 return 0;
156 #else
157 int pin[2], pout[2];
158 *pfdIn = 0;
159
--- src/popen.c
+++ src/popen.c
@@ -38,11 +38,11 @@
38 ** The following macros are used to cast pointers to integers and
39 ** integers to pointers. The way you do this varies from one compiler
40 ** to the next, so we have developed the following set of #if statements
41 ** to generate appropriate macros for a wide range of compilers.
42 **
43 ** The correct "ANSI" way to do this is to use the intptr_t type.
44 ** Unfortunately, that typedef is not available on all compilers, or
45 ** if it is available, it requires an #include of specific headers
46 ** that vary from one machine to the next.
47 **
48 ** This code is copied out of SQLite.
@@ -112,11 +112,11 @@
112 }
113 #endif
114
115 /*
116 ** Create a child process running shell command "zCmd". *ppOut is
117 ** a FILE that becomes the standard input of the child process.
118 ** (The caller writes to *ppOut in order to send text to the child.)
119 ** *ppIn is stdout from the child process. (The caller
120 ** reads from *ppIn in order to receive input from the child.)
121 ** Note that *ppIn is an unbuffered file descriptor, not a FILE.
122 ** The process ID of the child is written into *pChildPid.
@@ -124,17 +124,17 @@
124 ** Return the number of errors.
125 */
126 int popen2(const char *zCmd, int *pfdIn, FILE **ppOut, int *pChildPid){
127 #ifdef _WIN32
128 HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
129 SECURITY_ATTRIBUTES saAttr;
130 DWORD childPid = 0;
131 int fd;
132
133 saAttr.nLength = sizeof(saAttr);
134 saAttr.bInheritHandle = TRUE;
135 saAttr.lpSecurityDescriptor = NULL;
136 hStderr = GetStdHandle(STD_ERROR_HANDLE);
137 if( !CreatePipe(&hStdoutRd, &hStdoutWr, &saAttr, 4096) ){
138 win32_fatal_error("cannot create pipe for stdout");
139 }
140 SetHandleInformation( hStdoutRd, HANDLE_FLAG_INHERIT, FALSE);
@@ -141,18 +141,18 @@
141
142 if( !CreatePipe(&hStdinRd, &hStdinWr, &saAttr, 4096) ){
143 win32_fatal_error("cannot create pipe for stdin");
144 }
145 SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
146
147 win32_create_child_process(fossil_utf8_to_unicode(zCmd),
148 hStdinRd, hStdoutWr, hStderr,&childPid);
149 *pChildPid = childPid;
150 *pfdIn = _open_osfhandle(PTR_TO_INT(hStdoutRd), 0);
151 fd = _open_osfhandle(PTR_TO_INT(hStdinWr), 0);
152 *ppOut = _fdopen(fd, "w");
153 CloseHandle(hStdinRd);
154 CloseHandle(hStdoutWr);
155 return 0;
156 #else
157 int pin[2], pout[2];
158 *pfdIn = 0;
159

Keyboard Shortcuts

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