Fossil SCM
Fix a couple of C99-isms in the recent stash changes.
Commit
f378800aedba817f9716244b1ffc258a68f760a4
Parent
37d107501c25b2f…
1 file changed
+5
-2
+5
-2
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -600,20 +600,21 @@ | ||
| 600 | 600 | }else |
| 601 | 601 | if( memcmp(zCmd, "diff", nCmd)==0 ){ |
| 602 | 602 | const char *zDiffCmd = 0; |
| 603 | 603 | const char *zBinGlob = 0; |
| 604 | 604 | int fIncludeBinary = 0; |
| 605 | + u64 diffFlags; | |
| 605 | 606 | |
| 606 | 607 | if( find_option("tk",0,0)!=0 ){ |
| 607 | 608 | db_close(0); |
| 608 | 609 | diff_tk("stash diff", 3); |
| 609 | 610 | return; |
| 610 | 611 | } |
| 611 | 612 | if( find_option("internal","i",0)==0 ){ |
| 612 | 613 | zDiffCmd = diff_command_external(0); |
| 613 | 614 | } |
| 614 | - u64 diffFlags = diff_options(); | |
| 615 | + diffFlags = diff_options(); | |
| 615 | 616 | if( g.argc>4 ) usage("diff STASHID"); |
| 616 | 617 | if( zDiffCmd ){ |
| 617 | 618 | zBinGlob = diff_get_binary_glob(); |
| 618 | 619 | fIncludeBinary = diff_include_binary_files(); |
| 619 | 620 | } |
| @@ -622,14 +623,16 @@ | ||
| 622 | 623 | }else |
| 623 | 624 | if( memcmp(zCmd, "gdiff", nCmd)==0 ){ |
| 624 | 625 | const char *zDiffCmd = 0; |
| 625 | 626 | const char *zBinGlob = 0; |
| 626 | 627 | int fIncludeBinary = 0; |
| 628 | + u64 diffFlags; | |
| 629 | + | |
| 627 | 630 | if( find_option("internal","i",0)==0 ){ |
| 628 | 631 | zDiffCmd = diff_command_external(0); |
| 629 | 632 | } |
| 630 | - u64 diffFlags = diff_options(); | |
| 633 | + diffFlags = diff_options(); | |
| 631 | 634 | if( g.argc>4 ) usage("gdiff STASHID"); |
| 632 | 635 | if( zDiffCmd ){ |
| 633 | 636 | zBinGlob = diff_get_binary_glob(); |
| 634 | 637 | fIncludeBinary = diff_include_binary_files(); |
| 635 | 638 | } |
| 636 | 639 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -600,20 +600,21 @@ | |
| 600 | }else |
| 601 | if( memcmp(zCmd, "diff", nCmd)==0 ){ |
| 602 | const char *zDiffCmd = 0; |
| 603 | const char *zBinGlob = 0; |
| 604 | int fIncludeBinary = 0; |
| 605 | |
| 606 | if( find_option("tk",0,0)!=0 ){ |
| 607 | db_close(0); |
| 608 | diff_tk("stash diff", 3); |
| 609 | return; |
| 610 | } |
| 611 | if( find_option("internal","i",0)==0 ){ |
| 612 | zDiffCmd = diff_command_external(0); |
| 613 | } |
| 614 | u64 diffFlags = diff_options(); |
| 615 | if( g.argc>4 ) usage("diff STASHID"); |
| 616 | if( zDiffCmd ){ |
| 617 | zBinGlob = diff_get_binary_glob(); |
| 618 | fIncludeBinary = diff_include_binary_files(); |
| 619 | } |
| @@ -622,14 +623,16 @@ | |
| 622 | }else |
| 623 | if( memcmp(zCmd, "gdiff", nCmd)==0 ){ |
| 624 | const char *zDiffCmd = 0; |
| 625 | const char *zBinGlob = 0; |
| 626 | int fIncludeBinary = 0; |
| 627 | if( find_option("internal","i",0)==0 ){ |
| 628 | zDiffCmd = diff_command_external(0); |
| 629 | } |
| 630 | u64 diffFlags = diff_options(); |
| 631 | if( g.argc>4 ) usage("gdiff STASHID"); |
| 632 | if( zDiffCmd ){ |
| 633 | zBinGlob = diff_get_binary_glob(); |
| 634 | fIncludeBinary = diff_include_binary_files(); |
| 635 | } |
| 636 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -600,20 +600,21 @@ | |
| 600 | }else |
| 601 | if( memcmp(zCmd, "diff", nCmd)==0 ){ |
| 602 | const char *zDiffCmd = 0; |
| 603 | const char *zBinGlob = 0; |
| 604 | int fIncludeBinary = 0; |
| 605 | u64 diffFlags; |
| 606 | |
| 607 | if( find_option("tk",0,0)!=0 ){ |
| 608 | db_close(0); |
| 609 | diff_tk("stash diff", 3); |
| 610 | return; |
| 611 | } |
| 612 | if( find_option("internal","i",0)==0 ){ |
| 613 | zDiffCmd = diff_command_external(0); |
| 614 | } |
| 615 | diffFlags = diff_options(); |
| 616 | if( g.argc>4 ) usage("diff STASHID"); |
| 617 | if( zDiffCmd ){ |
| 618 | zBinGlob = diff_get_binary_glob(); |
| 619 | fIncludeBinary = diff_include_binary_files(); |
| 620 | } |
| @@ -622,14 +623,16 @@ | |
| 623 | }else |
| 624 | if( memcmp(zCmd, "gdiff", nCmd)==0 ){ |
| 625 | const char *zDiffCmd = 0; |
| 626 | const char *zBinGlob = 0; |
| 627 | int fIncludeBinary = 0; |
| 628 | u64 diffFlags; |
| 629 | |
| 630 | if( find_option("internal","i",0)==0 ){ |
| 631 | zDiffCmd = diff_command_external(0); |
| 632 | } |
| 633 | diffFlags = diff_options(); |
| 634 | if( g.argc>4 ) usage("gdiff STASHID"); |
| 635 | if( zDiffCmd ){ |
| 636 | zBinGlob = diff_get_binary_glob(); |
| 637 | fIncludeBinary = diff_include_binary_files(); |
| 638 | } |
| 639 |