summaryrefslogtreecommitdiff
path: root/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2013-10-02 13:17:06 +0000
committerThierry Thomas <thierry@FreeBSD.org>2013-10-02 13:17:06 +0000
commit015bed6ef707c63a18e7192fdb4cf641e28e9b6f (patch)
treedd1dd690d09dc41a63d7943e53114a104dcc85d8 /math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
parent- patch-makenet wasn't deleted last commit (diff)
- Upgrade to 5.9.10
Changelog at http://sourceforge.net/p/plplot/news/2013/10/plplot-release-5910/ - Pet portlint - Use staging.
Diffstat (limited to 'math/plplot/files/patch-bindings__tk-x-plat__plolotter.c')
-rw-r--r--math/plplot/files/patch-bindings__tk-x-plat__plolotter.c97
1 files changed, 3 insertions, 94 deletions
diff --git a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
index d1f6c28d495c..89323144928a 100644
--- a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
+++ b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c
@@ -1,15 +1,6 @@
---- bindings/tk-x-plat/plplotter.c.orig
-+++ bindings/tk-x-plat/plplotter.c
-@@ -463,7 +463,7 @@
- PlPlotterFirstInit( (ClientData) plPlotterPtr );
- Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 );
-
-- interp->result = Tk_PathName( plPlotterPtr->tkwin );
-+ Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE);
-
- return TCL_OK;
- }
-@@ -2018,7 +2018,7 @@
+--- bindings/tk-x-plat/plplotter.c.orig 2012-08-14 00:14:23.000000000 +0200
++++ bindings/tk-x-plat/plplotter.c 2013-10-01 22:42:16.000000000 +0200
+@@ -2024,7 +2024,7 @@
//
// Results:
// The return value is a standard Tcl result. If TCL_ERROR is
@@ -18,85 +9,3 @@
//
// Side effects:
// Configuration information, such as text string, colors, font, etc.
-@@ -2469,7 +2469,7 @@
- plr->at_bop = 0;
- if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
- fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-- plPlotterPtr->bopCmd, interp->result );
-+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) );
- }
-
- // Signal eop if necessary
-@@ -2479,7 +2479,7 @@
- plr->at_eop = 0;
- if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
- fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-- plPlotterPtr->eopCmd, interp->result );
-+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
- }
-
- return result;
-@@ -2491,7 +2491,7 @@
- {
- if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
- fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-- plPlotterPtr->eopCmd, interp->result );
-+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
- }
- }
-
-@@ -2501,7 +2501,7 @@
- {
- if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
- fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-- plPlotterPtr->bopCmd, interp->result );
-+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) );
- }
- }
-
-@@ -2536,7 +2536,7 @@
- {
- #endif
- Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n",
-- interp->result, (char *) NULL );
-+ Tcl_GetStringResult(interp), (char *) NULL );
- return TCL_ERROR;
- }
-
-@@ -3082,7 +3082,7 @@
-
- if ( argc == 0 )
- {
-- interp->result = "report what?";
-+ Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
- return TCL_ERROR;
- }
-
-@@ -3093,7 +3093,7 @@
-
- if ( argc != 3 )
- {
-- interp->result = "Wrong # of args: report wc x y";
-+ Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
- return TCL_ERROR;
- }
-
-@@ -3107,15 +3107,15 @@
-
- if ( plTranslateCursor( gin ) )
- {
-- sprintf( interp->result, "%f %f", gin->wX, gin->wY );
-+ sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
- return TCL_OK;
- }
-
-- interp->result = "Cannot locate";
-+ Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
- return TCL_OK;
- }
-
-- interp->result = "nonsensical request.";
-+ Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
- return TCL_ERROR;
- }
-