diff options
| author | nijtmans <nijtmans> | 2008-11-18 23:49:42 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-11-18 23:49:42 (GMT) |
| commit | 00d49f9867cee2ccb0107d42c242542bb1724968 (patch) | |
| tree | 977344186af30768099bdf29836d163bc796c6e0 /unix | |
| parent | d9fafe1f52ff004f0ff69bd9c137f8ac0ffa1a85 (diff) | |
| download | tk-00d49f9867cee2ccb0107d42c242542bb1724968.zip tk-00d49f9867cee2ccb0107d42c242542bb1724968.tar.gz tk-00d49f9867cee2ccb0107d42c242542bb1724968.tar.bz2 | |
Minor simplification in fix for [Bug 2312027]:
no need to malloc and copy photo type name because
it is a constant to begin with.
Convert Tcl_SetResult(......, TCL_DYNAMIC) to
Tcl_SetResult(......, TCL_VOLATILE), in preparation
for TIP #340
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixSend.c | 5 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c index 60cdf86..7394ec5 100644 --- a/unix/tkUnixSend.c +++ b/unix/tkUnixSend.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixSend.c,v 1.23 2008/11/05 22:48:58 nijtmans Exp $ + * RCS: @(#) $Id: tkUnixSend.c,v 1.24 2008/11/18 23:49:43 nijtmans Exp $ */ #include "tkUnixInt.h" @@ -1134,7 +1134,8 @@ Tk_SendCmd( Tcl_SetObjErrorCode(interp, errorObjPtr); ckfree(pending.errorCode); } - Tcl_SetResult(interp, pending.result, TCL_DYNAMIC); + Tcl_SetResult(interp, pending.result, TCL_VOLATILE); + ckfree(pending.result); return pending.code; } diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 2218d86..1b9cbdf 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.65 2008/11/15 00:00:27 patthoyts Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.66 2008/11/18 23:49:43 nijtmans Exp $ */ #include "tkUnixInt.h" @@ -1632,9 +1632,9 @@ WmCommandCmd( } if (objc == 3) { if (wmPtr->cmdArgv != NULL) { - Tcl_SetResult(interp, - Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv), - TCL_DYNAMIC); + argv3 = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv); + Tcl_SetResult(interp, argv3, TCL_VOLATILE); + ckfree(argv3); } return TCL_OK; } |