Fossil SCM
Restore some styling improvements.
Commit
ee598d69be048265df0ee0df71a67299cf807acd
Parent
b92e111a59cf850…
1 file changed
+4
-5
+4
-5
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -825,25 +825,24 @@ | ||
| 825 | 825 | |
| 826 | 826 | /* |
| 827 | 827 | ** Run the specified TH1 script, if any, and returns 1 on error. |
| 828 | 828 | */ |
| 829 | 829 | int xfer_run_script(const char *zScript, const char *zUuid){ |
| 830 | - int result = 0; | |
| 830 | + int result = TH_ERROR; | |
| 831 | 831 | if( !commonScriptRan || !zScript || !(zScript = db_get(zScript, 0))){ |
| 832 | - return 0; /* No script or common script didn't run, return success. */ | |
| 832 | + /* No script or common script didn't run, return success. */ | |
| 833 | + return TH_OK; | |
| 833 | 834 | } |
| 834 | 835 | if( commonScriptRan == 1 ){ |
| 835 | 836 | if( zUuid ){ |
| 836 | 837 | result = Th_SetVar(g.interp, "uuid", -1, zUuid, -1); |
| 837 | 838 | if( result!=TH_OK ){ |
| 838 | 839 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 839 | 840 | return result; |
| 840 | 841 | } |
| 841 | 842 | } |
| 842 | - result = Th_Eval(g.interp, 0, zScript, -1) != TH_OK; | |
| 843 | - }else{ | |
| 844 | - result = TH_ERROR; | |
| 843 | + result = Th_Eval(g.interp, 0, zScript, -1); | |
| 845 | 844 | } |
| 846 | 845 | if( result!=TH_OK ){ |
| 847 | 846 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 848 | 847 | } |
| 849 | 848 | return result; |
| 850 | 849 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -825,25 +825,24 @@ | |
| 825 | |
| 826 | /* |
| 827 | ** Run the specified TH1 script, if any, and returns 1 on error. |
| 828 | */ |
| 829 | int xfer_run_script(const char *zScript, const char *zUuid){ |
| 830 | int result = 0; |
| 831 | if( !commonScriptRan || !zScript || !(zScript = db_get(zScript, 0))){ |
| 832 | return 0; /* No script or common script didn't run, return success. */ |
| 833 | } |
| 834 | if( commonScriptRan == 1 ){ |
| 835 | if( zUuid ){ |
| 836 | result = Th_SetVar(g.interp, "uuid", -1, zUuid, -1); |
| 837 | if( result!=TH_OK ){ |
| 838 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 839 | return result; |
| 840 | } |
| 841 | } |
| 842 | result = Th_Eval(g.interp, 0, zScript, -1) != TH_OK; |
| 843 | }else{ |
| 844 | result = TH_ERROR; |
| 845 | } |
| 846 | if( result!=TH_OK ){ |
| 847 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 848 | } |
| 849 | return result; |
| 850 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -825,25 +825,24 @@ | |
| 825 | |
| 826 | /* |
| 827 | ** Run the specified TH1 script, if any, and returns 1 on error. |
| 828 | */ |
| 829 | int xfer_run_script(const char *zScript, const char *zUuid){ |
| 830 | int result = TH_ERROR; |
| 831 | if( !commonScriptRan || !zScript || !(zScript = db_get(zScript, 0))){ |
| 832 | /* No script or common script didn't run, return success. */ |
| 833 | return TH_OK; |
| 834 | } |
| 835 | if( commonScriptRan == 1 ){ |
| 836 | if( zUuid ){ |
| 837 | result = Th_SetVar(g.interp, "uuid", -1, zUuid, -1); |
| 838 | if( result!=TH_OK ){ |
| 839 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 840 | return result; |
| 841 | } |
| 842 | } |
| 843 | result = Th_Eval(g.interp, 0, zScript, -1); |
| 844 | } |
| 845 | if( result!=TH_OK ){ |
| 846 | fossil_error(1, "%s", Th_GetResult(g.interp, 0)); |
| 847 | } |
| 848 | return result; |
| 849 |