Merge pull request #245 from layus/feature/interp->result

Update deprecated uses of Tcl_Interp::result

Author: sjmackenzie

wish/unixmain.cc

@@ -126,7 +126,8 @@ static void             StdinProc _ANSI_ARGS_((ClientData clientData,
 int
 main(int argc, char **argv)
 {
-    char *args, *p, *msg;
+    char *args, *p;
+    const char *msg;
     char buf[20];
     int code;
 
@@ -140,7 +141,7 @@ main(int argc, char **argv)
 
     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, CONST_CAST(CONST_FOR_ARGV char**,argv), argTable, 0)
             != TCL_OK) {
-        fprintf(stdout, "w %s\n.\n", interp->result);
+        fprintf(stdout, "w %s\n.\n", Tcl_GetStringResult(interp));
         fflush(stdout); /* added mm */
         exit(1);
     }
@@ -175,7 +176,7 @@ main(int argc, char **argv)
 #ifdef RS
     mainWindow = Tk_CreateMainWindow(interp, display, name, "Tk");
     if (mainWindow == NULL) {
-        fprintf(stdout, "w %s\n.\n", interp->result);
+        fprintf(stdout, "w %s\n.\n", Tcl_GetStringResult(interp));
         fprintf(stdout, "s stop\n");
         fflush(stdout); /* added mm */
         exit(1);
@@ -215,7 +216,7 @@ main(int argc, char **argv)
      */
 
     if (Tcl_AppInit(interp) != TCL_OK) {
-        fprintf(stdout, "w Tcl_AppInit failed: %s\n.\n", interp->result);
+        fprintf(stdout, "w Tcl_AppInit failed: %s\n.\n", Tcl_GetStringResult(interp));
         fflush(stdout); /* added mm */
     }
 
@@ -226,15 +227,15 @@ main(int argc, char **argv)
     if (geometry != NULL) {
         code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
         if (code != TCL_OK) {
-            fprintf(stdout, "w %s\n.\n", interp->result);
+            fprintf(stdout, "w %s\n.\n", Tcl_GetStringResult(interp));
             fflush(stdout); /* added mm */
         }
     }
 
     /* mm: do not show the main window */
     code = Tcl_Eval(interp, "wm withdraw . ");
     if (code != TCL_OK) {
-      fprintf(stdout, "w %s\n.\n", interp->result);
+      fprintf(stdout, "w %s\n.\n", Tcl_GetStringResult(interp));
       fflush(stdout); /* added mm */
     }
 
@@ -284,7 +285,7 @@ main(int argc, char **argv)
 error:
     msg = CONST_CAST(char*,Tcl_GetVar(interp, CONST_CAST(CONST char*,"errorInfo"), TCL_GLOBAL_ONLY));
     if (msg == NULL) {
-        msg = interp->result;
+        msg = Tcl_GetStringResult(interp);
     }
     fprintf(stdout, "w %s\n.\n", msg);
     fflush(stdout);  /* added mm */
@@ -363,10 +364,10 @@ StdinProc(ClientData clientData, int mask)
     Tk_CreateFileHandler(0, 0, StdinProc, (ClientData) 0);
     code = Tcl_Eval(interp, cmd);
     Tk_CreateFileHandler(0, TK_READABLE, StdinProc, (ClientData) 0);
-    if (*interp->result != 0) {
+    if (*Tcl_GetStringResult(interp) != 0) {
         if ((code != TCL_OK) || (tty)) {
           fprintf(stdout,"w --- %s", cmd);
-          fprintf(stdout,"---  %s\n---\n.\n", interp->result);
+          fprintf(stdout,"---  %s\n---\n.\n", Tcl_GetStringResult(interp));
           fflush(stdout); /* by mm */
         }
     }
@@ -415,7 +416,7 @@ Prompt(Tcl_Interp *interp, int partial)
         if (code != TCL_OK) {
             Tcl_AddErrorInfo(interp,
                     "\n    (script that generates prompt)");
-            fprintf(stdout, "w %s\n.\n", interp->result);
+            fprintf(stdout, "w %s\n.\n", Tcl_GetStringResult(interp));
             fflush(stdout); /* added mm */
             goto defaultPrompt;
         }