Fossil SCM
Tweak comment style for consistency within functions
Commit
364d04315b162ec5496b56ac9de265272d0ef204b045bd14415a59e0b307dd91
Parent
de50c496d275a65…
2 files changed
+3
-5
+3
-3
+3
-5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1501,11 +1501,11 @@ | ||
| 1501 | 1501 | int nFBcard = 0; /* Number of B-cards and F-cards */ |
| 1502 | 1502 | int i; /* Loop counter */ |
| 1503 | 1503 | const char *zColor; /* Modified value of p->zColor */ |
| 1504 | 1504 | |
| 1505 | 1505 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 1506 | - * if it exists and if the "manifest" setting contains the "l" flag. */ | |
| 1506 | + ** if it exists and if the "manifest" setting contains the "l" flag. */ | |
| 1507 | 1507 | #ifdef _WIN32 |
| 1508 | 1508 | int manifestSymlinks = get_checkout_symlink_table(); |
| 1509 | 1509 | #endif |
| 1510 | 1510 | |
| 1511 | 1511 | assert( pBaseline==0 || pBaseline->zBaseline==0 ); |
| @@ -1563,20 +1563,18 @@ | ||
| 1563 | 1563 | |
| 1564 | 1564 | /* Potentially update the permissions of files selected to be checked in. */ |
| 1565 | 1565 | #ifdef _WIN32 |
| 1566 | 1566 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 1567 | 1567 | ** "manifest.symlinks" file exists, use its contents to determine which |
| 1568 | - ** files do and do not have the symlink permission. | |
| 1569 | - */ | |
| 1568 | + ** files do and do not have the symlink permission. */ | |
| 1570 | 1569 | if( isSelected && manifestSymlinks ){ |
| 1571 | 1570 | isLink = db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName); |
| 1572 | 1571 | } |
| 1573 | 1572 | #else |
| 1574 | 1573 | /* For unix, extract the "executable" and "symlink" permissions |
| 1575 | 1574 | ** directly from the filesystem. On windows, permissions are |
| 1576 | - ** unchanged from the original. | |
| 1577 | - */ | |
| 1575 | + ** unchanged from the original. */ | |
| 1578 | 1576 | if( isSelected ){ |
| 1579 | 1577 | int mPerm; |
| 1580 | 1578 | |
| 1581 | 1579 | mPerm = file_wd_perm(blob_str(&filename)); |
| 1582 | 1580 | isExe = ( mPerm==PERM_EXE ); |
| 1583 | 1581 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1501,11 +1501,11 @@ | |
| 1501 | int nFBcard = 0; /* Number of B-cards and F-cards */ |
| 1502 | int i; /* Loop counter */ |
| 1503 | const char *zColor; /* Modified value of p->zColor */ |
| 1504 | |
| 1505 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 1506 | * if it exists and if the "manifest" setting contains the "l" flag. */ |
| 1507 | #ifdef _WIN32 |
| 1508 | int manifestSymlinks = get_checkout_symlink_table(); |
| 1509 | #endif |
| 1510 | |
| 1511 | assert( pBaseline==0 || pBaseline->zBaseline==0 ); |
| @@ -1563,20 +1563,18 @@ | |
| 1563 | |
| 1564 | /* Potentially update the permissions of files selected to be checked in. */ |
| 1565 | #ifdef _WIN32 |
| 1566 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 1567 | ** "manifest.symlinks" file exists, use its contents to determine which |
| 1568 | ** files do and do not have the symlink permission. |
| 1569 | */ |
| 1570 | if( isSelected && manifestSymlinks ){ |
| 1571 | isLink = db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName); |
| 1572 | } |
| 1573 | #else |
| 1574 | /* For unix, extract the "executable" and "symlink" permissions |
| 1575 | ** directly from the filesystem. On windows, permissions are |
| 1576 | ** unchanged from the original. |
| 1577 | */ |
| 1578 | if( isSelected ){ |
| 1579 | int mPerm; |
| 1580 | |
| 1581 | mPerm = file_wd_perm(blob_str(&filename)); |
| 1582 | isExe = ( mPerm==PERM_EXE ); |
| 1583 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1501,11 +1501,11 @@ | |
| 1501 | int nFBcard = 0; /* Number of B-cards and F-cards */ |
| 1502 | int i; /* Loop counter */ |
| 1503 | const char *zColor; /* Modified value of p->zColor */ |
| 1504 | |
| 1505 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 1506 | ** if it exists and if the "manifest" setting contains the "l" flag. */ |
| 1507 | #ifdef _WIN32 |
| 1508 | int manifestSymlinks = get_checkout_symlink_table(); |
| 1509 | #endif |
| 1510 | |
| 1511 | assert( pBaseline==0 || pBaseline->zBaseline==0 ); |
| @@ -1563,20 +1563,18 @@ | |
| 1563 | |
| 1564 | /* Potentially update the permissions of files selected to be checked in. */ |
| 1565 | #ifdef _WIN32 |
| 1566 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 1567 | ** "manifest.symlinks" file exists, use its contents to determine which |
| 1568 | ** files do and do not have the symlink permission. */ |
| 1569 | if( isSelected && manifestSymlinks ){ |
| 1570 | isLink = db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName); |
| 1571 | } |
| 1572 | #else |
| 1573 | /* For unix, extract the "executable" and "symlink" permissions |
| 1574 | ** directly from the filesystem. On windows, permissions are |
| 1575 | ** unchanged from the original. */ |
| 1576 | if( isSelected ){ |
| 1577 | int mPerm; |
| 1578 | |
| 1579 | mPerm = file_wd_perm(blob_str(&filename)); |
| 1580 | isExe = ( mPerm==PERM_EXE ); |
| 1581 |
+3
-3
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -175,11 +175,11 @@ | ||
| 175 | 175 | Stmt q; |
| 176 | 176 | int useMtime = (cksigFlags & CKSIG_HASH)==0 |
| 177 | 177 | && db_get_boolean("mtime-changes", 1); |
| 178 | 178 | |
| 179 | 179 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 180 | - * if it exists and if the "manifest" setting contains the "l" flag. */ | |
| 180 | + ** if it exists and if the "manifest" setting contains the "l" flag. */ | |
| 181 | 181 | #ifdef _WIN32 |
| 182 | 182 | int manifestSymlinks = get_checkout_symlink_table(); |
| 183 | 183 | #endif |
| 184 | 184 | |
| 185 | 185 | db_begin_transaction(); |
| @@ -211,12 +211,12 @@ | ||
| 211 | 211 | currentSize = file_wd_size(zName); |
| 212 | 212 | currentMtime = file_wd_mtime(0); |
| 213 | 213 | origPerm = db_column_int(&q, 8); |
| 214 | 214 | #ifdef _WIN32 |
| 215 | 215 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 216 | - * "manifest.symlinks" file exists, use its contents to determine which | |
| 217 | - * files do and do not have the symlink permission. */ | |
| 216 | + ** "manifest.symlinks" file exists, use its contents to determine which | |
| 217 | + ** files do and do not have the symlink permission. */ | |
| 218 | 218 | if( manifestSymlinks |
| 219 | 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | 220 | currentPerm = PERM_LNK; |
| 221 | 221 | }else{ |
| 222 | 222 | currentPerm = origPerm; |
| 223 | 223 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -175,11 +175,11 @@ | |
| 175 | Stmt q; |
| 176 | int useMtime = (cksigFlags & CKSIG_HASH)==0 |
| 177 | && db_get_boolean("mtime-changes", 1); |
| 178 | |
| 179 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 180 | * if it exists and if the "manifest" setting contains the "l" flag. */ |
| 181 | #ifdef _WIN32 |
| 182 | int manifestSymlinks = get_checkout_symlink_table(); |
| 183 | #endif |
| 184 | |
| 185 | db_begin_transaction(); |
| @@ -211,12 +211,12 @@ | |
| 211 | currentSize = file_wd_size(zName); |
| 212 | currentMtime = file_wd_mtime(0); |
| 213 | origPerm = db_column_int(&q, 8); |
| 214 | #ifdef _WIN32 |
| 215 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 216 | * "manifest.symlinks" file exists, use its contents to determine which |
| 217 | * files do and do not have the symlink permission. */ |
| 218 | if( manifestSymlinks |
| 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | currentPerm = PERM_LNK; |
| 221 | }else{ |
| 222 | currentPerm = origPerm; |
| 223 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -175,11 +175,11 @@ | |
| 175 | Stmt q; |
| 176 | int useMtime = (cksigFlags & CKSIG_HASH)==0 |
| 177 | && db_get_boolean("mtime-changes", 1); |
| 178 | |
| 179 | /* On Windows, get symlink permission status from the "manifest.symlinks" file |
| 180 | ** if it exists and if the "manifest" setting contains the "l" flag. */ |
| 181 | #ifdef _WIN32 |
| 182 | int manifestSymlinks = get_checkout_symlink_table(); |
| 183 | #endif |
| 184 | |
| 185 | db_begin_transaction(); |
| @@ -211,12 +211,12 @@ | |
| 211 | currentSize = file_wd_size(zName); |
| 212 | currentMtime = file_wd_mtime(0); |
| 213 | origPerm = db_column_int(&q, 8); |
| 214 | #ifdef _WIN32 |
| 215 | /* For Windows, if the "manifest" setting contains the "l" flag and the |
| 216 | ** "manifest.symlinks" file exists, use its contents to determine which |
| 217 | ** files do and do not have the symlink permission. */ |
| 218 | if( manifestSymlinks |
| 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | currentPerm = PERM_LNK; |
| 221 | }else{ |
| 222 | currentPerm = origPerm; |
| 223 |