Fossil SCM

Remove some end-of-line whitespace and fix some very minor comment typos and capitalization errors

andygoth 2020-09-15 19:23 trunk
Commit 05379255237e325ffbc16b4133a8e0701fb4ff948b59220f2a243ea4a0be0086
Parent 83f03e91c455e51…
2 files changed +2 -2 +5 -5
~ src/add.c ~ src/file.c
M src/add.c
+2 -2
--- src/add.c
+++ src/add.c
@@ -193,11 +193,11 @@
193193
194194
 /*
195195
 ** Add all files in the sfile temp table.
196196
 **
197197
 ** Automatically exclude the repository file and any other files
198
-** with reserved names. Also exclude files that are beneath an
198
+** with reserved names. Also exclude files that are beneath an
199199
 ** existing symlink.
200200
 */
201201
 static int add_files_in_sfile(int vid){
202202
 const char *zRepo; /* Name of the repository database file */
203203
 int nAdd = 0; /* Number of files added */
@@ -216,11 +216,11 @@
216216
 if( filenames_are_case_sensitive() ){
217217
 xCmp = fossil_strcmp;
218218
 }else{
219219
 xCmp = fossil_stricmp;
220220
 }
221
- db_prepare(&loop,
221
+ db_prepare(&loop,
222222
 "SELECT pathname FROM sfile"
223223
 " WHERE pathname NOT IN ("
224224
 "SELECT sfile.pathname FROM vfile, sfile"
225225
 " WHERE vfile.islink"
226226
 " AND NOT vfile.deleted"
227227
--- src/add.c
+++ src/add.c
@@ -193,11 +193,11 @@
193
194 /*
195 ** Add all files in the sfile temp table.
196 **
197 ** Automatically exclude the repository file and any other files
198 ** with reserved names. Also exclude files that are beneath an
199 ** existing symlink.
200 */
201 static int add_files_in_sfile(int vid){
202 const char *zRepo; /* Name of the repository database file */
203 int nAdd = 0; /* Number of files added */
@@ -216,11 +216,11 @@
216 if( filenames_are_case_sensitive() ){
217 xCmp = fossil_strcmp;
218 }else{
219 xCmp = fossil_stricmp;
220 }
221 db_prepare(&loop,
222 "SELECT pathname FROM sfile"
223 " WHERE pathname NOT IN ("
224 "SELECT sfile.pathname FROM vfile, sfile"
225 " WHERE vfile.islink"
226 " AND NOT vfile.deleted"
227
--- src/add.c
+++ src/add.c
@@ -193,11 +193,11 @@
193
194 /*
195 ** Add all files in the sfile temp table.
196 **
197 ** Automatically exclude the repository file and any other files
198 ** with reserved names. Also exclude files that are beneath an
199 ** existing symlink.
200 */
201 static int add_files_in_sfile(int vid){
202 const char *zRepo; /* Name of the repository database file */
203 int nAdd = 0; /* Number of files added */
@@ -216,11 +216,11 @@
216 if( filenames_are_case_sensitive() ){
217 xCmp = fossil_strcmp;
218 }else{
219 xCmp = fossil_stricmp;
220 }
221 db_prepare(&loop,
222 "SELECT pathname FROM sfile"
223 " WHERE pathname NOT IN ("
224 "SELECT sfile.pathname FROM vfile, sfile"
225 " WHERE vfile.islink"
226 " AND NOT vfile.deleted"
227
M src/file.c
+5 -5
--- src/file.c
+++ src/file.c
@@ -54,12 +54,12 @@
5454
 ** instead always appear to the the target object.
5555
 **
5656
 ** SymFILE Symbolic links always appear to be files whose name is
5757
 ** the target pathname of the symbolic link.
5858
 **
59
-** RepoFILE Like symfile is allow-symlinks is true, or like
60
-** ExtFile if allow-symlinks is false. In other words,
59
+** RepoFILE Like SymFILE if allow-symlinks is true, or like
60
+** ExtFILE if allow-symlinks is false. In other words,
6161
 ** symbolic links are only recognized as something different
6262
 ** from files or directories if allow-symlinks is true.
6363
 */
6464
 #define ExtFILE 0 /* Always follow symlinks */
6565
 #define RepoFILE 1 /* Follow symlinks if and only if allow-symlinks is OFF */
@@ -439,11 +439,11 @@
439439
 };
440440
 if( !file_isfile(zFilename, ExtFILE) ) return 0;
441441
 sz = file_size(zFilename, ExtFILE);
442442
 if( sz<35328 ) return 0;
443443
 if( sz%512!=0 ) return 0;
444
- rc = sqlite3_open_v2(zFilename, &db,
444
+ rc = sqlite3_open_v2(zFilename, &db,
445445
 SQLITE_OPEN_READWRITE, 0);
446446
 if( rc!=0 ) goto not_a_repo;
447447
 for(i=0; i<count(azReqTab); i++){
448448
 if( sqlite3_table_column_metadata(db, "main", azReqTab[i],0,0,0,0,0,0) ){
449449
 goto not_a_repo;
@@ -645,11 +645,11 @@
645645
 */
646646
 int file_setexe(const char *zFilename, int onoff){
647647
 int rc = 0;
648648
 #if !defined(_WIN32)
649649
 struct stat buf;
650
- if( fossil_stat(zFilename, &buf, RepoFILE)!=0
650
+ if( fossil_stat(zFilename, &buf, RepoFILE)!=0
651651
 || S_ISLNK(buf.st_mode)
652652
 || S_ISDIR(buf.st_mode)
653653
 ){
654654
 return 0;
655655
 }
@@ -2554,15 +2554,15 @@
25542554
 }
25552555
 case 'T':
25562556
 case 't':{
25572557
 if( nFilename<9 || zEnd[-9]!='.'
25582558
 || fossil_strnicmp(".fslckout", &zEnd[-9], 9) ){
2559
- return 0;
2559
+ return 0;
25602560
 }
25612561
 if( 9==nFilename ) return 1;
25622562
 return zEnd[-10]=='/' ? 2 : gotSuffix;
25632563
 }
25642564
 default:{
25652565
 return 0;
25662566
 }
25672567
 }
25682568
 }
25692569
--- src/file.c
+++ src/file.c
@@ -54,12 +54,12 @@
54 ** instead always appear to the the target object.
55 **
56 ** SymFILE Symbolic links always appear to be files whose name is
57 ** the target pathname of the symbolic link.
58 **
59 ** RepoFILE Like symfile is allow-symlinks is true, or like
60 ** ExtFile if allow-symlinks is false. In other words,
61 ** symbolic links are only recognized as something different
62 ** from files or directories if allow-symlinks is true.
63 */
64 #define ExtFILE 0 /* Always follow symlinks */
65 #define RepoFILE 1 /* Follow symlinks if and only if allow-symlinks is OFF */
@@ -439,11 +439,11 @@
439 };
440 if( !file_isfile(zFilename, ExtFILE) ) return 0;
441 sz = file_size(zFilename, ExtFILE);
442 if( sz<35328 ) return 0;
443 if( sz%512!=0 ) return 0;
444 rc = sqlite3_open_v2(zFilename, &db,
445 SQLITE_OPEN_READWRITE, 0);
446 if( rc!=0 ) goto not_a_repo;
447 for(i=0; i<count(azReqTab); i++){
448 if( sqlite3_table_column_metadata(db, "main", azReqTab[i],0,0,0,0,0,0) ){
449 goto not_a_repo;
@@ -645,11 +645,11 @@
645 */
646 int file_setexe(const char *zFilename, int onoff){
647 int rc = 0;
648 #if !defined(_WIN32)
649 struct stat buf;
650 if( fossil_stat(zFilename, &buf, RepoFILE)!=0
651 || S_ISLNK(buf.st_mode)
652 || S_ISDIR(buf.st_mode)
653 ){
654 return 0;
655 }
@@ -2554,15 +2554,15 @@
2554 }
2555 case 'T':
2556 case 't':{
2557 if( nFilename<9 || zEnd[-9]!='.'
2558 || fossil_strnicmp(".fslckout", &zEnd[-9], 9) ){
2559 return 0;
2560 }
2561 if( 9==nFilename ) return 1;
2562 return zEnd[-10]=='/' ? 2 : gotSuffix;
2563 }
2564 default:{
2565 return 0;
2566 }
2567 }
2568 }
2569
--- src/file.c
+++ src/file.c
@@ -54,12 +54,12 @@
54 ** instead always appear to the the target object.
55 **
56 ** SymFILE Symbolic links always appear to be files whose name is
57 ** the target pathname of the symbolic link.
58 **
59 ** RepoFILE Like SymFILE if allow-symlinks is true, or like
60 ** ExtFILE if allow-symlinks is false. In other words,
61 ** symbolic links are only recognized as something different
62 ** from files or directories if allow-symlinks is true.
63 */
64 #define ExtFILE 0 /* Always follow symlinks */
65 #define RepoFILE 1 /* Follow symlinks if and only if allow-symlinks is OFF */
@@ -439,11 +439,11 @@
439 };
440 if( !file_isfile(zFilename, ExtFILE) ) return 0;
441 sz = file_size(zFilename, ExtFILE);
442 if( sz<35328 ) return 0;
443 if( sz%512!=0 ) return 0;
444 rc = sqlite3_open_v2(zFilename, &db,
445 SQLITE_OPEN_READWRITE, 0);
446 if( rc!=0 ) goto not_a_repo;
447 for(i=0; i<count(azReqTab); i++){
448 if( sqlite3_table_column_metadata(db, "main", azReqTab[i],0,0,0,0,0,0) ){
449 goto not_a_repo;
@@ -645,11 +645,11 @@
645 */
646 int file_setexe(const char *zFilename, int onoff){
647 int rc = 0;
648 #if !defined(_WIN32)
649 struct stat buf;
650 if( fossil_stat(zFilename, &buf, RepoFILE)!=0
651 || S_ISLNK(buf.st_mode)
652 || S_ISDIR(buf.st_mode)
653 ){
654 return 0;
655 }
@@ -2554,15 +2554,15 @@
2554 }
2555 case 'T':
2556 case 't':{
2557 if( nFilename<9 || zEnd[-9]!='.'
2558 || fossil_strnicmp(".fslckout", &zEnd[-9], 9) ){
2559 return 0;
2560 }
2561 if( 9==nFilename ) return 1;
2562 return zEnd[-10]=='/' ? 2 : gotSuffix;
2563 }
2564 default:{
2565 return 0;
2566 }
2567 }
2568 }
2569

Keyboard Shortcuts

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