Fossil SCM
Minor code style and spacing cleanup.
Commit
40d5560f22f5e8d82e2605683d1c7964bd3f25bc
Parent
2f9c2ea5a5bdb3f…
3 files changed
+1
-1
+3
-3
+1
-1
+1
-1
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -176,11 +176,11 @@ | ||
| 176 | 176 | |
| 177 | 177 | /* Commit */ |
| 178 | 178 | db_end_transaction(0); |
| 179 | 179 | |
| 180 | 180 | /* Do an autosync push, if requested */ |
| 181 | - if( !isPrivate ) autosync_loop(SYNC_PUSH,db_get_int("autosync-tries", 1)); | |
| 181 | + if( !isPrivate ) autosync_loop(SYNC_PUSH, db_get_int("autosync-tries", 1)); | |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /* |
| 185 | 185 | ** Prepare a query that will list branches. |
| 186 | 186 | ** |
| 187 | 187 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -176,11 +176,11 @@ | |
| 176 | |
| 177 | /* Commit */ |
| 178 | db_end_transaction(0); |
| 179 | |
| 180 | /* Do an autosync push, if requested */ |
| 181 | if( !isPrivate ) autosync_loop(SYNC_PUSH,db_get_int("autosync-tries", 1)); |
| 182 | } |
| 183 | |
| 184 | /* |
| 185 | ** Prepare a query that will list branches. |
| 186 | ** |
| 187 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -176,11 +176,11 @@ | |
| 176 | |
| 177 | /* Commit */ |
| 178 | db_end_transaction(0); |
| 179 | |
| 180 | /* Do an autosync push, if requested */ |
| 181 | if( !isPrivate ) autosync_loop(SYNC_PUSH, db_get_int("autosync-tries", 1)); |
| 182 | } |
| 183 | |
| 184 | /* |
| 185 | ** Prepare a query that will list branches. |
| 186 | ** |
| 187 |
+3
-3
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -77,18 +77,18 @@ | ||
| 77 | 77 | return rc; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /* |
| 81 | 81 | ** This routine will try a number of times to perform autosync with a |
| 82 | -** .5 second sleep between attempts; returning the last autosync status. | |
| 82 | +** 0.5 second sleep between attempts; returning the last autosync status. | |
| 83 | 83 | */ |
| 84 | 84 | int autosync_loop(int flags, int nTries){ |
| 85 | 85 | int n = 0; |
| 86 | 86 | int rc = 0; |
| 87 | - while( (n==0 || n < nTries) && (rc = autosync(flags)) ){ | |
| 87 | + while( (n==0 || n<nTries) && (rc=autosync(flags)) ){ | |
| 88 | 88 | if( rc ){ |
| 89 | - if( ++n < nTries ){ | |
| 89 | + if( ++n<nTries ){ | |
| 90 | 90 | fossil_warning("Autosync failed, making another attempt."); |
| 91 | 91 | sqlite3_sleep(500); |
| 92 | 92 | }else{ |
| 93 | 93 | fossil_warning("Autosync failed."); |
| 94 | 94 | } |
| 95 | 95 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -77,18 +77,18 @@ | |
| 77 | return rc; |
| 78 | } |
| 79 | |
| 80 | /* |
| 81 | ** This routine will try a number of times to perform autosync with a |
| 82 | ** .5 second sleep between attempts; returning the last autosync status. |
| 83 | */ |
| 84 | int autosync_loop(int flags, int nTries){ |
| 85 | int n = 0; |
| 86 | int rc = 0; |
| 87 | while( (n==0 || n < nTries) && (rc = autosync(flags)) ){ |
| 88 | if( rc ){ |
| 89 | if( ++n < nTries ){ |
| 90 | fossil_warning("Autosync failed, making another attempt."); |
| 91 | sqlite3_sleep(500); |
| 92 | }else{ |
| 93 | fossil_warning("Autosync failed."); |
| 94 | } |
| 95 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -77,18 +77,18 @@ | |
| 77 | return rc; |
| 78 | } |
| 79 | |
| 80 | /* |
| 81 | ** This routine will try a number of times to perform autosync with a |
| 82 | ** 0.5 second sleep between attempts; returning the last autosync status. |
| 83 | */ |
| 84 | int autosync_loop(int flags, int nTries){ |
| 85 | int n = 0; |
| 86 | int rc = 0; |
| 87 | while( (n==0 || n<nTries) && (rc=autosync(flags)) ){ |
| 88 | if( rc ){ |
| 89 | if( ++n<nTries ){ |
| 90 | fossil_warning("Autosync failed, making another attempt."); |
| 91 | sqlite3_sleep(500); |
| 92 | }else{ |
| 93 | fossil_warning("Autosync failed."); |
| 94 | } |
| 95 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -130,11 +130,11 @@ | ||
| 130 | 130 | capture_case_sensitive_option(); |
| 131 | 131 | db_must_be_within_tree(); |
| 132 | 132 | vid = db_lget_int("checkout", 0); |
| 133 | 133 | user_select(); |
| 134 | 134 | if( !dryRunFlag && !internalUpdate ){ |
| 135 | - if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, | |
| 135 | + if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, | |
| 136 | 136 | db_get_int("autosync-tries", 1)) ){ |
| 137 | 137 | fossil_fatal("Cannot proceed with update"); |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -130,11 +130,11 @@ | |
| 130 | capture_case_sensitive_option(); |
| 131 | db_must_be_within_tree(); |
| 132 | vid = db_lget_int("checkout", 0); |
| 133 | user_select(); |
| 134 | if( !dryRunFlag && !internalUpdate ){ |
| 135 | if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, |
| 136 | db_get_int("autosync-tries", 1)) ){ |
| 137 | fossil_fatal("Cannot proceed with update"); |
| 138 | } |
| 139 | } |
| 140 | |
| 141 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -130,11 +130,11 @@ | |
| 130 | capture_case_sensitive_option(); |
| 131 | db_must_be_within_tree(); |
| 132 | vid = db_lget_int("checkout", 0); |
| 133 | user_select(); |
| 134 | if( !dryRunFlag && !internalUpdate ){ |
| 135 | if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, |
| 136 | db_get_int("autosync-tries", 1)) ){ |
| 137 | fossil_fatal("Cannot proceed with update"); |
| 138 | } |
| 139 | } |
| 140 | |
| 141 |