--- graphviz-2.20.3/tclpkg/tclpathplan/tclpathplan.c 2004-12-22 20:05:35.000000000 -0800 +++ graphviz-2.20.3/tclpkg/tclpathplan/tclpathplan.c.new 2008-12-06 00:20:46.000000000 -0800 @@ -186,7 +186,7 @@ } if (Tcl_GlobalEval(interp, Tcl_DStringValue(&scripts)) != TCL_OK) fprintf(stderr, "%s while in binding: %s\n\n", - interp->result, Tcl_DStringValue(&scripts)); + Tcl_GetStringResult(interp), Tcl_DStringValue(&scripts)); Tcl_DStringFree(&scripts); } --- graphviz-2.20.3/tclpkg/tcldot/tcldot.c 2008-04-29 10:31:05.000000000 -0700 +++ graphviz-2.20.3/tclpkg/tcldot/tcldot.c.new 2008-12-06 00:39:07.000000000 -0800 @@ -384,21 +384,21 @@ if (! (ep = (Agedge_t **) tclhandleXlateIndex(edgeTblPtr, e->handle)) || *ep != e) { - ep = (Agedge_t **) tclhandleAlloc(edgeTblPtr, interp->result, + ep = (Agedge_t **) tclhandleAlloc(edgeTblPtr, Tcl_GetStringResult(interp), &id); *ep = e; e->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, edgecmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), edgecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, edgecmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), edgecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ } else { - tclhandleString(edgeTblPtr, interp->result, e->handle); + tclhandleString(edgeTblPtr, Tcl_GetStringResult(interp), e->handle); } setedgeattributes(g->root, e, &argv[3], argc - 3); reset_layout(gvc, g); @@ -539,7 +539,7 @@ return TCL_OK; } else if ((c == 's') && (strncmp(argv[1], "showname", length) == 0)) { - interp->result = n->name; + Tcl_SetResult(interp, n->name, TCL_DYNAMIC); return TCL_OK; } else { @@ -678,21 +678,21 @@ if (! (ep = (Agedge_t **) tclhandleXlateIndex(edgeTblPtr, e->handle)) || *ep != e) { - ep = (Agedge_t **) tclhandleAlloc(edgeTblPtr, interp->result, + ep = (Agedge_t **) tclhandleAlloc(edgeTblPtr, Tcl_GetStringResult(interp), &id); *ep = e; e->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, edgecmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), edgecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, edgecmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), edgecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ } else { - tclhandleString(edgeTblPtr, interp->result, e->handle); + tclhandleString(edgeTblPtr, Tcl_GetStringResult(interp), e->handle); } setedgeattributes(g->root, e, &argv[4], argc - 4); reset_layout(gvc, g); @@ -708,35 +708,35 @@ (Agnode_t **) tclhandleXlateIndex(nodeTblPtr, n->handle)) || *np != n) { np = (Agnode_t **) tclhandleAlloc(nodeTblPtr, - interp->result, &id); + Tcl_GetStringResult(interp), &id); *np = n; n->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, nodecmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), nodecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, nodecmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), nodecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ } else { - tclhandleString(nodeTblPtr, interp->result, n->handle); + tclhandleString(nodeTblPtr, Tcl_GetStringResult(interp), n->handle); } } else { /* else use handle as name */ - np = (Agnode_t **) tclhandleAlloc(nodeTblPtr, interp->result, + np = (Agnode_t **) tclhandleAlloc(nodeTblPtr, Tcl_GetStringResult(interp), &id); - n = agnode(g, interp->result); + n = agnode(g, Tcl_GetStringResult(interp)); i = 2; *np = n; n->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, nodecmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), nodecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, nodecmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), nodecmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ @@ -763,36 +763,36 @@ || *sgp != sg) { sgp = (Agraph_t **) tclhandleAlloc(graphTblPtr, - interp->result, &id); + Tcl_GetStringResult(interp), &id); *sgp = sg; sg->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, graphcmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, graphcmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ } else { - tclhandleString(graphTblPtr, interp->result, sg->handle); + tclhandleString(graphTblPtr, Tcl_GetStringResult(interp), sg->handle); } } else { /* else use handle as name */ sgp = - (Agraph_t **) tclhandleAlloc(graphTblPtr, interp->result, + (Agraph_t **) tclhandleAlloc(graphTblPtr, Tcl_GetStringResult(interp), &id); - sg = agsubg(g, interp->result); + sg = agsubg(g, Tcl_GetStringResult(interp)); i = 2; *sgp = sg; sg->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, graphcmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, graphcmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ @@ -1243,7 +1243,7 @@ return TCL_OK; } else if ((c == 's') && (strncmp(argv[1], "showname", length) == 0)) { - interp->result = g->name; + Tcl_SetResult(interp, g->name, TCL_DYNAMIC); return TCL_OK; } else if ((c == 'w') && (strncmp(argv[1], "write", length) == 0)) { @@ -1345,14 +1345,14 @@ (char *) NULL); return TCL_ERROR; } - gp = (Agraph_t **) tclhandleAlloc(graphTblPtr, interp->result, &id); + gp = (Agraph_t **) tclhandleAlloc(graphTblPtr, Tcl_GetStringResult(interp), &id); if (argc % 2) { /* if odd number of args then argv[2] is name */ g = agopen(argv[2], kind); i = 3; } else { /* else use handle as name */ - g = agopen(interp->result, kind); + g = agopen(Tcl_GetStringResult(interp), kind); i = 2; } if (!g) { @@ -1364,10 +1364,10 @@ g->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, graphcmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, graphcmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ setgraphattributes(g, &argv[i], argc - i); @@ -1408,18 +1408,18 @@ (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ if (sg == g) - strcpy(interp->result, buf); + strcpy(Tcl_GetStringResult(interp), buf); } } else { - gp = (Agraph_t **) tclhandleAlloc(graphTblPtr, interp->result, + gp = (Agraph_t **) tclhandleAlloc(graphTblPtr, Tcl_GetStringResult(interp), &id); *gp = g; g->handle = id; #ifndef TCLOBJ - Tcl_CreateCommand(interp, interp->result, graphcmd, + Tcl_CreateCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #else /* TCLOBJ */ - Tcl_CreateObjCommand(interp, interp->result, graphcmd, + Tcl_CreateObjCommand(interp, Tcl_GetStringResult(interp), graphcmd, (ClientData) gvc, (Tcl_CmdDeleteProc *) NULL); #endif /* TCLOBJ */ }