Fossil SCM

Coding style whitespace fixes. No functional changes.

mistachkin 2015-04-29 17:47 trunk
Commit 7d257deae2398e11574934f1f874983602c7bdb5
Parent ab849410f58c484…
1 file changed +9 -9
~ src/checkin.c
M src/checkin.c
+9 -9
--- src/checkin.c
+++ src/checkin.c
@@ -44,15 +44,15 @@
4444
 Blob where;
4545
 const char *zName;
4646
 int i;
4747
4848
 blob_zero(&where);
49
- for(i=2; i<g.argc; i++) {
49
+ for(i=2; i<g.argc; i++){
5050
 Blob fname;
5151
 file_tree_name(g.argv[i], &fname, 1);
5252
 zName = blob_str(&fname);
53
- if( fossil_strcmp(zName, ".")==0 ) {
53
+ if( fossil_strcmp(zName, ".")==0 ){
5454
 blob_reset(&where);
5555
 break;
5656
 }
5757
 blob_append_sql(&where,
5858
 " %s (pathname=%Q %s) "
@@ -290,11 +290,11 @@
290290
 blob_zero(&where);
291291
 for(i=2; i<g.argc; i++){
292292
 Blob fname;
293293
 file_tree_name(g.argv[i], &fname, 1);
294294
 zName = blob_str(&fname);
295
- if( fossil_strcmp(zName, ".")==0 ) {
295
+ if( fossil_strcmp(zName, ".")==0 ){
296296
 blob_reset(&where);
297297
 break;
298298
 }
299299
 blob_append_sql(&where,
300300
 " %s (pathname=%Q %s) "
@@ -403,11 +403,11 @@
403403
 blob_zero(&where);
404404
 for(i=2; i<g.argc; i++){
405405
 Blob fname;
406406
 file_tree_name(g.argv[i], &fname, 1);
407407
 zName = blob_str(&fname);
408
- if( fossil_strcmp(zName, ".")==0 ) {
408
+ if( fossil_strcmp(zName, ".")==0 ){
409409
 blob_reset(&where);
410410
 break;
411411
 }
412412
 blob_append_sql(&where,
413413
 " %s (pathname=%Q %s) "
@@ -595,11 +595,11 @@
595595
 db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
596596
 blob_zero(&rewrittenPathname);
597597
 g.allowSymlinks = 1; /* Report on symbolic links */
598598
 while( db_step(&q)==SQLITE_ROW ){
599599
 zDisplayName = zPathname = db_column_text(&q, 0);
600
- if( cwdRelative ) {
600
+ if( cwdRelative ){
601601
 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
602602
 file_relative_name(zFullName, &rewrittenPathname, 0);
603603
 free(zFullName);
604604
 zDisplayName = blob_str(&rewrittenPathname);
605605
 if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){
@@ -761,11 +761,11 @@
761761
 blob_reset(&ans);
762762
 continue;
763763
 }
764764
 blob_reset(&ans);
765765
 }
766
- if ( dryRunFlag || file_delete(zName)==0 ){
766
+ if( dryRunFlag || file_delete(zName)==0 ){
767767
 if( verboseFlag || dryRunFlag ){
768768
 fossil_print("Removed unmanaged file: %s\n", zName+nRoot);
769769
 }
770770
 }else if( verboseFlag ){
771771
 fossil_print("Could not remove file: %s\n", zName+nRoot);
@@ -809,11 +809,11 @@
809809
 blob_reset(&ans);
810810
 continue;
811811
 }
812812
 blob_reset(&ans);
813813
 }
814
- if ( dryRunFlag || file_rmdir(zName)==0 ){
814
+ if( dryRunFlag || file_rmdir(zName)==0 ){
815815
 if( verboseFlag || dryRunFlag ){
816816
 fossil_print("Removed unmanaged directory: %s\n", zName+nRoot);
817817
 }
818818
 }else if( verboseFlag ){
819819
 fossil_print("Could not remove directory: %s\n", zName+nRoot);
@@ -948,11 +948,11 @@
948948
 Blob prompt;
949949
 #if defined(_WIN32) || defined(__CYGWIN__)
950950
 int bomSize;
951951
 const unsigned char *bom = get_utf8_bom(&bomSize);
952952
 blob_init(&prompt, (const char *) bom, bomSize);
953
- if( zInit && zInit[0]) {
953
+ if( zInit && zInit[0]){
954954
 blob_append(&prompt, zInit, -1);
955955
 }
956956
 #else
957957
 blob_init(&prompt, zInit, -1);
958958
 #endif
@@ -1489,11 +1489,11 @@
14891489
 fossil_free(zOrig);
14901490
 f = fossil_fopen(zFilename, "wb");
14911491
 if( f==0 ){
14921492
 fossil_warning("cannot open %s for writing", zFilename);
14931493
 }else{
1494
- if( fUnicode ) {
1494
+ if( fUnicode ){
14951495
 int bomSize;
14961496
 const unsigned char *bom = get_utf8_bom(&bomSize);
14971497
 fwrite(bom, 1, bomSize, f);
14981498
 blob_to_utf8_no_bom(p, 0);
14991499
 }else if( fHasInvalidUtf8 ){
15001500
--- src/checkin.c
+++ src/checkin.c
@@ -44,15 +44,15 @@
44 Blob where;
45 const char *zName;
46 int i;
47
48 blob_zero(&where);
49 for(i=2; i<g.argc; i++) {
50 Blob fname;
51 file_tree_name(g.argv[i], &fname, 1);
52 zName = blob_str(&fname);
53 if( fossil_strcmp(zName, ".")==0 ) {
54 blob_reset(&where);
55 break;
56 }
57 blob_append_sql(&where,
58 " %s (pathname=%Q %s) "
@@ -290,11 +290,11 @@
290 blob_zero(&where);
291 for(i=2; i<g.argc; i++){
292 Blob fname;
293 file_tree_name(g.argv[i], &fname, 1);
294 zName = blob_str(&fname);
295 if( fossil_strcmp(zName, ".")==0 ) {
296 blob_reset(&where);
297 break;
298 }
299 blob_append_sql(&where,
300 " %s (pathname=%Q %s) "
@@ -403,11 +403,11 @@
403 blob_zero(&where);
404 for(i=2; i<g.argc; i++){
405 Blob fname;
406 file_tree_name(g.argv[i], &fname, 1);
407 zName = blob_str(&fname);
408 if( fossil_strcmp(zName, ".")==0 ) {
409 blob_reset(&where);
410 break;
411 }
412 blob_append_sql(&where,
413 " %s (pathname=%Q %s) "
@@ -595,11 +595,11 @@
595 db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
596 blob_zero(&rewrittenPathname);
597 g.allowSymlinks = 1; /* Report on symbolic links */
598 while( db_step(&q)==SQLITE_ROW ){
599 zDisplayName = zPathname = db_column_text(&q, 0);
600 if( cwdRelative ) {
601 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
602 file_relative_name(zFullName, &rewrittenPathname, 0);
603 free(zFullName);
604 zDisplayName = blob_str(&rewrittenPathname);
605 if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){
@@ -761,11 +761,11 @@
761 blob_reset(&ans);
762 continue;
763 }
764 blob_reset(&ans);
765 }
766 if ( dryRunFlag || file_delete(zName)==0 ){
767 if( verboseFlag || dryRunFlag ){
768 fossil_print("Removed unmanaged file: %s\n", zName+nRoot);
769 }
770 }else if( verboseFlag ){
771 fossil_print("Could not remove file: %s\n", zName+nRoot);
@@ -809,11 +809,11 @@
809 blob_reset(&ans);
810 continue;
811 }
812 blob_reset(&ans);
813 }
814 if ( dryRunFlag || file_rmdir(zName)==0 ){
815 if( verboseFlag || dryRunFlag ){
816 fossil_print("Removed unmanaged directory: %s\n", zName+nRoot);
817 }
818 }else if( verboseFlag ){
819 fossil_print("Could not remove directory: %s\n", zName+nRoot);
@@ -948,11 +948,11 @@
948 Blob prompt;
949 #if defined(_WIN32) || defined(__CYGWIN__)
950 int bomSize;
951 const unsigned char *bom = get_utf8_bom(&bomSize);
952 blob_init(&prompt, (const char *) bom, bomSize);
953 if( zInit && zInit[0]) {
954 blob_append(&prompt, zInit, -1);
955 }
956 #else
957 blob_init(&prompt, zInit, -1);
958 #endif
@@ -1489,11 +1489,11 @@
1489 fossil_free(zOrig);
1490 f = fossil_fopen(zFilename, "wb");
1491 if( f==0 ){
1492 fossil_warning("cannot open %s for writing", zFilename);
1493 }else{
1494 if( fUnicode ) {
1495 int bomSize;
1496 const unsigned char *bom = get_utf8_bom(&bomSize);
1497 fwrite(bom, 1, bomSize, f);
1498 blob_to_utf8_no_bom(p, 0);
1499 }else if( fHasInvalidUtf8 ){
1500
--- src/checkin.c
+++ src/checkin.c
@@ -44,15 +44,15 @@
44 Blob where;
45 const char *zName;
46 int i;
47
48 blob_zero(&where);
49 for(i=2; i<g.argc; i++){
50 Blob fname;
51 file_tree_name(g.argv[i], &fname, 1);
52 zName = blob_str(&fname);
53 if( fossil_strcmp(zName, ".")==0 ){
54 blob_reset(&where);
55 break;
56 }
57 blob_append_sql(&where,
58 " %s (pathname=%Q %s) "
@@ -290,11 +290,11 @@
290 blob_zero(&where);
291 for(i=2; i<g.argc; i++){
292 Blob fname;
293 file_tree_name(g.argv[i], &fname, 1);
294 zName = blob_str(&fname);
295 if( fossil_strcmp(zName, ".")==0 ){
296 blob_reset(&where);
297 break;
298 }
299 blob_append_sql(&where,
300 " %s (pathname=%Q %s) "
@@ -403,11 +403,11 @@
403 blob_zero(&where);
404 for(i=2; i<g.argc; i++){
405 Blob fname;
406 file_tree_name(g.argv[i], &fname, 1);
407 zName = blob_str(&fname);
408 if( fossil_strcmp(zName, ".")==0 ){
409 blob_reset(&where);
410 break;
411 }
412 blob_append_sql(&where,
413 " %s (pathname=%Q %s) "
@@ -595,11 +595,11 @@
595 db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
596 blob_zero(&rewrittenPathname);
597 g.allowSymlinks = 1; /* Report on symbolic links */
598 while( db_step(&q)==SQLITE_ROW ){
599 zDisplayName = zPathname = db_column_text(&q, 0);
600 if( cwdRelative ){
601 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
602 file_relative_name(zFullName, &rewrittenPathname, 0);
603 free(zFullName);
604 zDisplayName = blob_str(&rewrittenPathname);
605 if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){
@@ -761,11 +761,11 @@
761 blob_reset(&ans);
762 continue;
763 }
764 blob_reset(&ans);
765 }
766 if( dryRunFlag || file_delete(zName)==0 ){
767 if( verboseFlag || dryRunFlag ){
768 fossil_print("Removed unmanaged file: %s\n", zName+nRoot);
769 }
770 }else if( verboseFlag ){
771 fossil_print("Could not remove file: %s\n", zName+nRoot);
@@ -809,11 +809,11 @@
809 blob_reset(&ans);
810 continue;
811 }
812 blob_reset(&ans);
813 }
814 if( dryRunFlag || file_rmdir(zName)==0 ){
815 if( verboseFlag || dryRunFlag ){
816 fossil_print("Removed unmanaged directory: %s\n", zName+nRoot);
817 }
818 }else if( verboseFlag ){
819 fossil_print("Could not remove directory: %s\n", zName+nRoot);
@@ -948,11 +948,11 @@
948 Blob prompt;
949 #if defined(_WIN32) || defined(__CYGWIN__)
950 int bomSize;
951 const unsigned char *bom = get_utf8_bom(&bomSize);
952 blob_init(&prompt, (const char *) bom, bomSize);
953 if( zInit && zInit[0]){
954 blob_append(&prompt, zInit, -1);
955 }
956 #else
957 blob_init(&prompt, zInit, -1);
958 #endif
@@ -1489,11 +1489,11 @@
1489 fossil_free(zOrig);
1490 f = fossil_fopen(zFilename, "wb");
1491 if( f==0 ){
1492 fossil_warning("cannot open %s for writing", zFilename);
1493 }else{
1494 if( fUnicode ){
1495 int bomSize;
1496 const unsigned char *bom = get_utf8_bom(&bomSize);
1497 fwrite(bom, 1, bomSize, f);
1498 blob_to_utf8_no_bom(p, 0);
1499 }else if( fHasInvalidUtf8 ){
1500

Keyboard Shortcuts

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