Fossil SCM
Coding style tweaks. No changes to functionality.
Commit
3bb04c90dc7209e7e4a8a02113985b470be91cc0
Parent
189bfc28e7a3a16…
1 file changed
+6
-6
+6
-6
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -264,19 +264,19 @@ | ||
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | 267 | #ifndef _WIN32 |
| 268 | 268 | if( chnged==0 || chnged==6 || chnged==7 || chnged==8 || chnged==9 ){ |
| 269 | - if( origPerm == currentPerm ){ | |
| 269 | + if( origPerm==currentPerm ){ | |
| 270 | 270 | chnged = 0; |
| 271 | - }else if( currentPerm == PERM_EXE ){ | |
| 271 | + }else if( currentPerm==PERM_EXE ){ | |
| 272 | 272 | chnged = 6; |
| 273 | - }else if( currentPerm == PERM_LNK ){ | |
| 273 | + }else if( currentPerm==PERM_LNK ){ | |
| 274 | 274 | chnged = 7; |
| 275 | - }else if( origPerm == PERM_EXE ){ | |
| 275 | + }else if( origPerm==PERM_EXE ){ | |
| 276 | 276 | chnged = 8; |
| 277 | - }else if( origPerm == PERM_LNK ){ | |
| 277 | + }else if( origPerm==PERM_LNK ){ | |
| 278 | 278 | chnged = 9; |
| 279 | 279 | } |
| 280 | 280 | } |
| 281 | 281 | #endif |
| 282 | 282 | if( currentMtime!=oldMtime || chnged!=oldChnged ){ |
| @@ -348,11 +348,11 @@ | ||
| 348 | 348 | blob_reset(&content); |
| 349 | 349 | continue; |
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | if( verbose ) fossil_print("%s\n", &zName[nRepos]); |
| 353 | - if( file_wd_isdir(zName) == 1 ){ | |
| 353 | + if( file_wd_isdir(zName)==1 ){ | |
| 354 | 354 | /*TODO(dchest): remove directories? */ |
| 355 | 355 | fossil_fatal("%s is directory, cannot overwrite\n", zName); |
| 356 | 356 | } |
| 357 | 357 | if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){ |
| 358 | 358 | file_delete(zName); |
| 359 | 359 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -264,19 +264,19 @@ | |
| 264 | } |
| 265 | } |
| 266 | } |
| 267 | #ifndef _WIN32 |
| 268 | if( chnged==0 || chnged==6 || chnged==7 || chnged==8 || chnged==9 ){ |
| 269 | if( origPerm == currentPerm ){ |
| 270 | chnged = 0; |
| 271 | }else if( currentPerm == PERM_EXE ){ |
| 272 | chnged = 6; |
| 273 | }else if( currentPerm == PERM_LNK ){ |
| 274 | chnged = 7; |
| 275 | }else if( origPerm == PERM_EXE ){ |
| 276 | chnged = 8; |
| 277 | }else if( origPerm == PERM_LNK ){ |
| 278 | chnged = 9; |
| 279 | } |
| 280 | } |
| 281 | #endif |
| 282 | if( currentMtime!=oldMtime || chnged!=oldChnged ){ |
| @@ -348,11 +348,11 @@ | |
| 348 | blob_reset(&content); |
| 349 | continue; |
| 350 | } |
| 351 | } |
| 352 | if( verbose ) fossil_print("%s\n", &zName[nRepos]); |
| 353 | if( file_wd_isdir(zName) == 1 ){ |
| 354 | /*TODO(dchest): remove directories? */ |
| 355 | fossil_fatal("%s is directory, cannot overwrite\n", zName); |
| 356 | } |
| 357 | if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){ |
| 358 | file_delete(zName); |
| 359 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -264,19 +264,19 @@ | |
| 264 | } |
| 265 | } |
| 266 | } |
| 267 | #ifndef _WIN32 |
| 268 | if( chnged==0 || chnged==6 || chnged==7 || chnged==8 || chnged==9 ){ |
| 269 | if( origPerm==currentPerm ){ |
| 270 | chnged = 0; |
| 271 | }else if( currentPerm==PERM_EXE ){ |
| 272 | chnged = 6; |
| 273 | }else if( currentPerm==PERM_LNK ){ |
| 274 | chnged = 7; |
| 275 | }else if( origPerm==PERM_EXE ){ |
| 276 | chnged = 8; |
| 277 | }else if( origPerm==PERM_LNK ){ |
| 278 | chnged = 9; |
| 279 | } |
| 280 | } |
| 281 | #endif |
| 282 | if( currentMtime!=oldMtime || chnged!=oldChnged ){ |
| @@ -348,11 +348,11 @@ | |
| 348 | blob_reset(&content); |
| 349 | continue; |
| 350 | } |
| 351 | } |
| 352 | if( verbose ) fossil_print("%s\n", &zName[nRepos]); |
| 353 | if( file_wd_isdir(zName)==1 ){ |
| 354 | /*TODO(dchest): remove directories? */ |
| 355 | fossil_fatal("%s is directory, cannot overwrite\n", zName); |
| 356 | } |
| 357 | if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){ |
| 358 | file_delete(zName); |
| 359 |