Fossil SCM
Improve some comments and whitespace.
Commit
be267722ce229a0eea46088e14247b1e8465abcb
Parent
e4e2b2e40e17077…
1 file changed
+8
-6
+8
-6
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -948,19 +948,21 @@ | ||
| 948 | 948 | blob_write_to_file(&script, zTempFile); |
| 949 | 949 | fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile); |
| 950 | 950 | }else{ |
| 951 | 951 | #if defined(FOSSIL_ENABLE_TCL) |
| 952 | 952 | Th_FossilInit(TH_INIT_DEFAULT); |
| 953 | - if( evaluateTclWithEvents( | |
| 954 | - g.interp, &g.tcl, blob_str(&script), blob_size(&script), 1)==TCL_OK ){ | |
| 953 | + if( evaluateTclWithEvents(g.interp, &g.tcl, blob_str(&script), | |
| 954 | + blob_size(&script), 1)==TCL_OK ){ | |
| 955 | 955 | blob_reset(&script); |
| 956 | 956 | return; |
| 957 | 957 | } |
| 958 | - /* If evaluation of the script fails, the reason could be that Tk | |
| 959 | - * cannot be found by the built-in Tcl, or that Tcl cannot be | |
| 960 | - * loaded dynamically (e.g. Win64 Tcl in Win32 fossil). Try again | |
| 961 | - * using an external "tclsh", which might work in those two cases. */ | |
| 958 | + /* | |
| 959 | + * If evaluation of the Tcl script fails, the reason may be that Tk | |
| 960 | + * could not be found by the loaded Tcl, or that Tcl cannot be loaded | |
| 961 | + * dynamically (e.g. x64 Tcl with x86 Fossil). Therefore, fallback | |
| 962 | + * to using the external "tclsh", if available. | |
| 963 | + */ | |
| 962 | 964 | #endif |
| 963 | 965 | zTempFile = write_blob_to_temp_file(&script); |
| 964 | 966 | zCmd = mprintf("tclsh \"%s\"", zTempFile); |
| 965 | 967 | fossil_system(zCmd); |
| 966 | 968 | file_delete(zTempFile); |
| 967 | 969 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -948,19 +948,21 @@ | |
| 948 | blob_write_to_file(&script, zTempFile); |
| 949 | fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile); |
| 950 | }else{ |
| 951 | #if defined(FOSSIL_ENABLE_TCL) |
| 952 | Th_FossilInit(TH_INIT_DEFAULT); |
| 953 | if( evaluateTclWithEvents( |
| 954 | g.interp, &g.tcl, blob_str(&script), blob_size(&script), 1)==TCL_OK ){ |
| 955 | blob_reset(&script); |
| 956 | return; |
| 957 | } |
| 958 | /* If evaluation of the script fails, the reason could be that Tk |
| 959 | * cannot be found by the built-in Tcl, or that Tcl cannot be |
| 960 | * loaded dynamically (e.g. Win64 Tcl in Win32 fossil). Try again |
| 961 | * using an external "tclsh", which might work in those two cases. */ |
| 962 | #endif |
| 963 | zTempFile = write_blob_to_temp_file(&script); |
| 964 | zCmd = mprintf("tclsh \"%s\"", zTempFile); |
| 965 | fossil_system(zCmd); |
| 966 | file_delete(zTempFile); |
| 967 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -948,19 +948,21 @@ | |
| 948 | blob_write_to_file(&script, zTempFile); |
| 949 | fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile); |
| 950 | }else{ |
| 951 | #if defined(FOSSIL_ENABLE_TCL) |
| 952 | Th_FossilInit(TH_INIT_DEFAULT); |
| 953 | if( evaluateTclWithEvents(g.interp, &g.tcl, blob_str(&script), |
| 954 | blob_size(&script), 1)==TCL_OK ){ |
| 955 | blob_reset(&script); |
| 956 | return; |
| 957 | } |
| 958 | /* |
| 959 | * If evaluation of the Tcl script fails, the reason may be that Tk |
| 960 | * could not be found by the loaded Tcl, or that Tcl cannot be loaded |
| 961 | * dynamically (e.g. x64 Tcl with x86 Fossil). Therefore, fallback |
| 962 | * to using the external "tclsh", if available. |
| 963 | */ |
| 964 | #endif |
| 965 | zTempFile = write_blob_to_temp_file(&script); |
| 966 | zCmd = mprintf("tclsh \"%s\"", zTempFile); |
| 967 | fossil_system(zCmd); |
| 968 | file_delete(zTempFile); |
| 969 |