diff options
Diffstat (limited to 'mac/tclMacBOAMain.c')
| -rw-r--r-- | mac/tclMacBOAMain.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/mac/tclMacBOAMain.c b/mac/tclMacBOAMain.c index 76689de..7d6c2ea 100644 --- a/mac/tclMacBOAMain.c +++ b/mac/tclMacBOAMain.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tclMacBOAMain.c 1.1 97/11/03 17:06:22 + * SCCS: @(#) tclMacBOAMain.c 1.3 97/12/19 10:42:08 */ #include "tcl.h" @@ -147,14 +147,16 @@ Tcl_Main(argc, argv, appInitProc) */ if ((*appInitProc)(interp) != TCL_OK) { - Tcl_DString errStr; - Tcl_DStringInit(&errStr); - Tcl_DStringAppend(&errStr, - "application-specific initialization failed: \n", -1); - Tcl_DStringAppend(&errStr, interp->result, -1); - Tcl_DStringAppend(&errStr, "\n", 1); - TclMacDoNotification(Tcl_DStringValue(&errStr)); - goto done; + Tcl_DString errStr; + + Tcl_DStringInit(&errStr); + Tcl_DStringAppend(&errStr, + "application-specific initialization failed: \n", -1); + Tcl_DStringAppend(&errStr, Tcl_GetStringResult(interp), -1); + Tcl_DStringAppend(&errStr, "\n", 1); + TclMacDoNotification(Tcl_DStringValue(&errStr)); + Tcl_DStringFree(&errStr); + goto done; } /* @@ -192,10 +194,9 @@ Tcl_Main(argc, argv, appInitProc) Tcl_DStringAppend(&errStr, " Error sourcing resource or file: ", -1); Tcl_DStringAppend(&errStr, fileName, -1); Tcl_DStringAppend(&errStr, "\n\nError was: ", -1); - Tcl_DStringAppend(&errStr, interp->result, -1); - + Tcl_DStringAppend(&errStr, Tcl_GetStringResult(interp), -1); TclMacDoNotification(Tcl_DStringValue(&errStr)); - + Tcl_DStringFree(&errStr); } goto done; } @@ -312,7 +313,7 @@ Tcl_MacBGNotifyObjCmd(clientData, interp, objc, objv) return TCL_ERROR; } - TclMacDoNotification(Tcl_GetStringFromObj(objv[1], (int *) NULL)); + TclMacDoNotification(Tcl_GetString(objv[1])); return TCL_OK; } |