Fossil SCM
Eliminate all usage of Tcl_GetStringResult(), since that causes loss of Tcl_Obj representation in Tcl 8.x (this is solved in Tcl 9.0)
Commit
743e166cf95c86e5de21c3a245113258d820c0c26424dd5a41a7a452087446c3
Parent
282612762eeef14…
1 file changed
+3
-3
+3
-3
| --- src/th_tcl.c | ||
| +++ src/th_tcl.c | ||
| @@ -1164,18 +1164,18 @@ | ||
| 1164 | 1164 | return TH_ERROR; |
| 1165 | 1165 | } |
| 1166 | 1166 | tclContext->interp = tclInterp; |
| 1167 | 1167 | if( Tcl_Init(tclInterp)!=TCL_OK ){ |
| 1168 | 1168 | Th_ErrorMessage(interp, |
| 1169 | - "Tcl initialization error:", Tcl_GetStringResult(tclInterp), -1); | |
| 1169 | + "Tcl initialization error:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); | |
| 1170 | 1170 | Tcl_DeleteInterp(tclInterp); |
| 1171 | 1171 | tclContext->interp = tclInterp = 0; |
| 1172 | 1172 | return TH_ERROR; |
| 1173 | 1173 | } |
| 1174 | 1174 | if( setTclArguments(tclInterp, argc, argv)!=TCL_OK ){ |
| 1175 | 1175 | Th_ErrorMessage(interp, |
| 1176 | - "Tcl error setting arguments:", Tcl_GetStringResult(tclInterp), -1); | |
| 1176 | + "Tcl error setting arguments:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); | |
| 1177 | 1177 | Tcl_DeleteInterp(tclInterp); |
| 1178 | 1178 | tclContext->interp = tclInterp = 0; |
| 1179 | 1179 | return TH_ERROR; |
| 1180 | 1180 | } |
| 1181 | 1181 | /* |
| @@ -1194,11 +1194,11 @@ | ||
| 1194 | 1194 | Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL); |
| 1195 | 1195 | /* If necessary, evaluate the custom Tcl setup script. */ |
| 1196 | 1196 | setup = tclContext->setup; |
| 1197 | 1197 | if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){ |
| 1198 | 1198 | Th_ErrorMessage(interp, |
| 1199 | - "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1); | |
| 1199 | + "Tcl setup script error:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); | |
| 1200 | 1200 | Tcl_DeleteInterp(tclInterp); |
| 1201 | 1201 | tclContext->interp = tclInterp = 0; |
| 1202 | 1202 | return TH_ERROR; |
| 1203 | 1203 | } |
| 1204 | 1204 | return TH_OK; |
| 1205 | 1205 |
| --- src/th_tcl.c | |
| +++ src/th_tcl.c | |
| @@ -1164,18 +1164,18 @@ | |
| 1164 | return TH_ERROR; |
| 1165 | } |
| 1166 | tclContext->interp = tclInterp; |
| 1167 | if( Tcl_Init(tclInterp)!=TCL_OK ){ |
| 1168 | Th_ErrorMessage(interp, |
| 1169 | "Tcl initialization error:", Tcl_GetStringResult(tclInterp), -1); |
| 1170 | Tcl_DeleteInterp(tclInterp); |
| 1171 | tclContext->interp = tclInterp = 0; |
| 1172 | return TH_ERROR; |
| 1173 | } |
| 1174 | if( setTclArguments(tclInterp, argc, argv)!=TCL_OK ){ |
| 1175 | Th_ErrorMessage(interp, |
| 1176 | "Tcl error setting arguments:", Tcl_GetStringResult(tclInterp), -1); |
| 1177 | Tcl_DeleteInterp(tclInterp); |
| 1178 | tclContext->interp = tclInterp = 0; |
| 1179 | return TH_ERROR; |
| 1180 | } |
| 1181 | /* |
| @@ -1194,11 +1194,11 @@ | |
| 1194 | Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL); |
| 1195 | /* If necessary, evaluate the custom Tcl setup script. */ |
| 1196 | setup = tclContext->setup; |
| 1197 | if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){ |
| 1198 | Th_ErrorMessage(interp, |
| 1199 | "Tcl setup script error:", Tcl_GetStringResult(tclInterp), -1); |
| 1200 | Tcl_DeleteInterp(tclInterp); |
| 1201 | tclContext->interp = tclInterp = 0; |
| 1202 | return TH_ERROR; |
| 1203 | } |
| 1204 | return TH_OK; |
| 1205 |
| --- src/th_tcl.c | |
| +++ src/th_tcl.c | |
| @@ -1164,18 +1164,18 @@ | |
| 1164 | return TH_ERROR; |
| 1165 | } |
| 1166 | tclContext->interp = tclInterp; |
| 1167 | if( Tcl_Init(tclInterp)!=TCL_OK ){ |
| 1168 | Th_ErrorMessage(interp, |
| 1169 | "Tcl initialization error:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); |
| 1170 | Tcl_DeleteInterp(tclInterp); |
| 1171 | tclContext->interp = tclInterp = 0; |
| 1172 | return TH_ERROR; |
| 1173 | } |
| 1174 | if( setTclArguments(tclInterp, argc, argv)!=TCL_OK ){ |
| 1175 | Th_ErrorMessage(interp, |
| 1176 | "Tcl error setting arguments:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); |
| 1177 | Tcl_DeleteInterp(tclInterp); |
| 1178 | tclContext->interp = tclInterp = 0; |
| 1179 | return TH_ERROR; |
| 1180 | } |
| 1181 | /* |
| @@ -1194,11 +1194,11 @@ | |
| 1194 | Tcl_CreateObjCommand(tclInterp, "th1Expr", Th1ExprObjCmd, interp, NULL); |
| 1195 | /* If necessary, evaluate the custom Tcl setup script. */ |
| 1196 | setup = tclContext->setup; |
| 1197 | if( setup && Tcl_EvalEx(tclInterp, setup, -1, 0)!=TCL_OK ){ |
| 1198 | Th_ErrorMessage(interp, |
| 1199 | "Tcl setup script error:", Tcl_GetString(Tcl_GetObjResult(tclInterp)), -1); |
| 1200 | Tcl_DeleteInterp(tclInterp); |
| 1201 | tclContext->interp = tclInterp = 0; |
| 1202 | return TH_ERROR; |
| 1203 | } |
| 1204 | return TH_OK; |
| 1205 |