Fossil SCM
Fix indentation.
Commit
70b82e8cc5ce90c77de55114d4c08389d4f9ded6
Parent
10f9673a251c740…
1 file changed
+10
-10
+10
-10
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -575,13 +575,13 @@ | ||
| 575 | 575 | fossil_free(gg.zMark); |
| 576 | 576 | gg.zMark = fossil_strdup(&zLine[5]); |
| 577 | 577 | }else |
| 578 | 578 | if( memcmp(zLine, "tagger ", 7)==0 || memcmp(zLine, "committer ",10)==0 ){ |
| 579 | 579 | sqlite3_int64 secSince1970; |
| 580 | - int hastz; | |
| 581 | - char tzdir; | |
| 582 | - int tz; | |
| 580 | + int hastz; | |
| 581 | + char tzdir; | |
| 582 | + int tz; | |
| 583 | 583 | for(i=0; zLine[i] && zLine[i]!='<'; i++){} |
| 584 | 584 | if( zLine[i]==0 ) goto malformed_line; |
| 585 | 585 | z = &zLine[i+1]; |
| 586 | 586 | for(i=i+1; zLine[i] && zLine[i]!='>'; i++){} |
| 587 | 587 | if( zLine[i]==0 ) goto malformed_line; |
| @@ -588,23 +588,23 @@ | ||
| 588 | 588 | zLine[i] = 0; |
| 589 | 589 | fossil_free(gg.zUser); |
| 590 | 590 | gg.zUser = fossil_strdup(z); |
| 591 | 591 | secSince1970 = 0; |
| 592 | 592 | |
| 593 | - /* We don't use sscanf here because of int64 portability issues. */ | |
| 593 | + /* We don't use sscanf here because of int64 portability issues. */ | |
| 594 | 594 | for(i=i+2; fossil_isdigit(zLine[i]); i++){ |
| 595 | 595 | secSince1970 = secSince1970*10 + zLine[i] - '0'; |
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | /* Read in optional timezone modifier (we don't know if it's strictly |
| 599 | - * optional, but better to be sure). */ | |
| 599 | + * optional, but better to be sure). */ | |
| 600 | 600 | tzdir = '+'; |
| 601 | - tz = 0; | |
| 602 | - hastz = sscanf(&zLine[i], " %c%d", &tzdir, &tz); | |
| 603 | - if ((hastz == 1) || (hastz > 2)) goto malformed_line; | |
| 604 | - secSince1970 += ((tzdir == '-') ? -1 : 1) * | |
| 605 | - ((tz/100)*3600 + (tz%100)*60); | |
| 601 | + tz = 0; | |
| 602 | + hastz = sscanf(&zLine[i], " %c%d", &tzdir, &tz); | |
| 603 | + if ((hastz == 1) || (hastz > 2)) goto malformed_line; | |
| 604 | + secSince1970 += ((tzdir == '-') ? -1 : 1) * | |
| 605 | + ((tz/100)*3600 + (tz%100)*60); | |
| 606 | 606 | |
| 607 | 607 | fossil_free(gg.zDate); |
| 608 | 608 | gg.zDate = db_text(0, "SELECT datetime(%lld, 'unixepoch')", secSince1970); |
| 609 | 609 | gg.zDate[10] = 'T'; |
| 610 | 610 | }else |
| 611 | 611 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -575,13 +575,13 @@ | |
| 575 | fossil_free(gg.zMark); |
| 576 | gg.zMark = fossil_strdup(&zLine[5]); |
| 577 | }else |
| 578 | if( memcmp(zLine, "tagger ", 7)==0 || memcmp(zLine, "committer ",10)==0 ){ |
| 579 | sqlite3_int64 secSince1970; |
| 580 | int hastz; |
| 581 | char tzdir; |
| 582 | int tz; |
| 583 | for(i=0; zLine[i] && zLine[i]!='<'; i++){} |
| 584 | if( zLine[i]==0 ) goto malformed_line; |
| 585 | z = &zLine[i+1]; |
| 586 | for(i=i+1; zLine[i] && zLine[i]!='>'; i++){} |
| 587 | if( zLine[i]==0 ) goto malformed_line; |
| @@ -588,23 +588,23 @@ | |
| 588 | zLine[i] = 0; |
| 589 | fossil_free(gg.zUser); |
| 590 | gg.zUser = fossil_strdup(z); |
| 591 | secSince1970 = 0; |
| 592 | |
| 593 | /* We don't use sscanf here because of int64 portability issues. */ |
| 594 | for(i=i+2; fossil_isdigit(zLine[i]); i++){ |
| 595 | secSince1970 = secSince1970*10 + zLine[i] - '0'; |
| 596 | } |
| 597 | |
| 598 | /* Read in optional timezone modifier (we don't know if it's strictly |
| 599 | * optional, but better to be sure). */ |
| 600 | tzdir = '+'; |
| 601 | tz = 0; |
| 602 | hastz = sscanf(&zLine[i], " %c%d", &tzdir, &tz); |
| 603 | if ((hastz == 1) || (hastz > 2)) goto malformed_line; |
| 604 | secSince1970 += ((tzdir == '-') ? -1 : 1) * |
| 605 | ((tz/100)*3600 + (tz%100)*60); |
| 606 | |
| 607 | fossil_free(gg.zDate); |
| 608 | gg.zDate = db_text(0, "SELECT datetime(%lld, 'unixepoch')", secSince1970); |
| 609 | gg.zDate[10] = 'T'; |
| 610 | }else |
| 611 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -575,13 +575,13 @@ | |
| 575 | fossil_free(gg.zMark); |
| 576 | gg.zMark = fossil_strdup(&zLine[5]); |
| 577 | }else |
| 578 | if( memcmp(zLine, "tagger ", 7)==0 || memcmp(zLine, "committer ",10)==0 ){ |
| 579 | sqlite3_int64 secSince1970; |
| 580 | int hastz; |
| 581 | char tzdir; |
| 582 | int tz; |
| 583 | for(i=0; zLine[i] && zLine[i]!='<'; i++){} |
| 584 | if( zLine[i]==0 ) goto malformed_line; |
| 585 | z = &zLine[i+1]; |
| 586 | for(i=i+1; zLine[i] && zLine[i]!='>'; i++){} |
| 587 | if( zLine[i]==0 ) goto malformed_line; |
| @@ -588,23 +588,23 @@ | |
| 588 | zLine[i] = 0; |
| 589 | fossil_free(gg.zUser); |
| 590 | gg.zUser = fossil_strdup(z); |
| 591 | secSince1970 = 0; |
| 592 | |
| 593 | /* We don't use sscanf here because of int64 portability issues. */ |
| 594 | for(i=i+2; fossil_isdigit(zLine[i]); i++){ |
| 595 | secSince1970 = secSince1970*10 + zLine[i] - '0'; |
| 596 | } |
| 597 | |
| 598 | /* Read in optional timezone modifier (we don't know if it's strictly |
| 599 | * optional, but better to be sure). */ |
| 600 | tzdir = '+'; |
| 601 | tz = 0; |
| 602 | hastz = sscanf(&zLine[i], " %c%d", &tzdir, &tz); |
| 603 | if ((hastz == 1) || (hastz > 2)) goto malformed_line; |
| 604 | secSince1970 += ((tzdir == '-') ? -1 : 1) * |
| 605 | ((tz/100)*3600 + (tz%100)*60); |
| 606 | |
| 607 | fossil_free(gg.zDate); |
| 608 | gg.zDate = db_text(0, "SELECT datetime(%lld, 'unixepoch')", secSince1970); |
| 609 | gg.zDate[10] = 'T'; |
| 610 | }else |
| 611 |