summaryrefslogtreecommitdiffstats
path: root/generic/tkOldConfig.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2002-01-25 21:09:35 (GMT)
committerdgp@users.sourceforge.net <dgp>2002-01-25 21:09:35 (GMT)
commitf9e161c6a1b457af56730f949b1962d6ed5ca8bf (patch)
tree2041d0c0de9f76a800e1af4c067e78376fbdd570 /generic/tkOldConfig.c
parent0a63fd5f1fe7e283b624dfd10c330088a9baeac1 (diff)
downloadtk-f9e161c6a1b457af56730f949b1962d6ed5ca8bf.zip
tk-f9e161c6a1b457af56730f949b1962d6ed5ca8bf.tar.gz
tk-f9e161c6a1b457af56730f949b1962d6ed5ca8bf.tar.bz2
* Updated callers of Tcl_SplitList and Tcl_Merge.
* Updated callers of Tcl_GetStringResult. Rewrote PrintScrollFractions to ScrollFractions to stop scribbling directly on interp->result. * Updated callers of Tcl_GetVar, Tcl_GetVar2 * Updated callers of Tcl_SplitPath, Tcl_JoinPath, and Tcl_TranslateFileName.
Diffstat (limited to 'generic/tkOldConfig.c')
-rw-r--r--generic/tkOldConfig.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index 61b1258..1f206fb 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.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: tkOldConfig.c,v 1.9 2000/05/17 21:17:21 ericm Exp $
+ * RCS: @(#) $Id: tkOldConfig.c,v 1.10 2002/01/25 21:09:37 dgp Exp $
*/
#include "tkPort.h"
@@ -707,7 +707,8 @@ FormatConfigInfo(interp, tkwin, specPtr, widgRec)
char *widgRec; /* Pointer to record holding current
* values of info for widget. */
{
- char *argv[6], *result;
+ CONST char *argv[6];
+ char *result;
char buffer[200];
Tcl_FreeProc *freeProc = (Tcl_FreeProc *) NULL;
@@ -735,9 +736,9 @@ FormatConfigInfo(interp, tkwin, specPtr, widgRec)
result = Tcl_Merge(5, argv);
if (freeProc != NULL) {
if ((freeProc == TCL_DYNAMIC) || (freeProc == (Tcl_FreeProc *) free)) {
- ckfree(argv[4]);
+ ckfree((char *)argv[4]);
} else {
- (*freeProc)(argv[4]);
+ (*freeProc)((char *)argv[4]);
}
}
return result;