Fossil SCM
Per feedback, further improve the Tcl shared library error message.
Commit
aad3ef32885dd1c6b765c1b0c94a5837188da6bb
Parent
6e1e4bb83dae3db…
1 file changed
+3
-2
+3
-2
| --- src/th_tcl.c | ||
| +++ src/th_tcl.c | ||
| @@ -671,13 +671,14 @@ | ||
| 671 | 671 | *pxCreateInterp = xCreateInterp; |
| 672 | 672 | *pxDeleteInterp = xDeleteInterp; |
| 673 | 673 | return TH_OK; |
| 674 | 674 | } |
| 675 | 675 | } while( --fileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */ |
| 676 | - fileName[TCL_MINOR_OFFSET]++; | |
| 676 | + fileName[TCL_MINOR_OFFSET] = 'x'; | |
| 677 | 677 | Th_ErrorMessage(interp, |
| 678 | - "could not load Tcl shared library \"", fileName, -1); | |
| 678 | + "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"", | |
| 679 | + fileName, -1); | |
| 679 | 680 | return TH_ERROR; |
| 680 | 681 | #else |
| 681 | 682 | *pLibrary = 0; |
| 682 | 683 | *pxFindExecutable = Tcl_FindExecutable; |
| 683 | 684 | *pxCreateInterp = Tcl_CreateInterp; |
| 684 | 685 |
| --- src/th_tcl.c | |
| +++ src/th_tcl.c | |
| @@ -671,13 +671,14 @@ | |
| 671 | *pxCreateInterp = xCreateInterp; |
| 672 | *pxDeleteInterp = xDeleteInterp; |
| 673 | return TH_OK; |
| 674 | } |
| 675 | } while( --fileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */ |
| 676 | fileName[TCL_MINOR_OFFSET]++; |
| 677 | Th_ErrorMessage(interp, |
| 678 | "could not load Tcl shared library \"", fileName, -1); |
| 679 | return TH_ERROR; |
| 680 | #else |
| 681 | *pLibrary = 0; |
| 682 | *pxFindExecutable = Tcl_FindExecutable; |
| 683 | *pxCreateInterp = Tcl_CreateInterp; |
| 684 |
| --- src/th_tcl.c | |
| +++ src/th_tcl.c | |
| @@ -671,13 +671,14 @@ | |
| 671 | *pxCreateInterp = xCreateInterp; |
| 672 | *pxDeleteInterp = xDeleteInterp; |
| 673 | return TH_OK; |
| 674 | } |
| 675 | } while( --fileName[TCL_MINOR_OFFSET]>'3' ); /* Tcl 8.4+ */ |
| 676 | fileName[TCL_MINOR_OFFSET] = 'x'; |
| 677 | Th_ErrorMessage(interp, |
| 678 | "could not load any supported Tcl 8.6, 8.5, or 8.4 shared library \"", |
| 679 | fileName, -1); |
| 680 | return TH_ERROR; |
| 681 | #else |
| 682 | *pLibrary = 0; |
| 683 | *pxFindExecutable = Tcl_FindExecutable; |
| 684 | *pxCreateInterp = Tcl_CreateInterp; |
| 685 |