summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-05-04 12:36:21 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-05-04 12:36:21 (GMT)
commit20afef407358051d2aa59f04036a09d1a1f170e9 (patch)
treed7af794a9405237e88a0a103fc3c4583df6cecd2
parent0ee8afdd395f429b790f93da033ddb1f2dff5301 (diff)
downloadtcl-20afef407358051d2aa59f04036a09d1a1f170e9.zip
tcl-20afef407358051d2aa59f04036a09d1a1f170e9.tar.gz
tcl-20afef407358051d2aa59f04036a09d1a1f170e9.tar.bz2
Suppress a signed-ness warning.
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclEvent.c13
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c25644..60f8284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * generic/tclEvent.c (TclSetLibraryPath): Suppress a warning.
+
2004-05-03 Andreas Kupries <andreask@activestate.com>
* Applied [SF Tcl Patch 868853], fixing a mem leak in
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 3c067a4..4ebdb9f 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.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: tclEvent.c,v 1.34 2004/04/23 07:21:15 davygrvy Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.35 2004/05/04 12:36:22 dkf Exp $
*/
#include "tclInt.h"
@@ -676,8 +676,8 @@ TclSetLibraryPath(pathPtr)
ckfree(tclLibraryPathStr);
}
toDupe = Tcl_GetStringFromObj(pathPtr, &size);
- tclLibraryPathStr = ckalloc(size+1);
- strcpy(tclLibraryPathStr, toDupe);
+ tclLibraryPathStr = ckalloc((unsigned)size+1);
+ memcpy(tclLibraryPathStr, toDupe, (unsigned)size+1);
}
/*
@@ -1114,6 +1114,9 @@ Tcl_VwaitObjCmd(clientData, interp, objc, objv)
foundEvent = 1;
while (!done && foundEvent) {
foundEvent = Tcl_DoOneEvent(TCL_ALL_EVENTS);
+ if (Tcl_LimitExceeded(interp)) {
+ return TCL_ERROR;
+ }
}
Tcl_UntraceVar(interp, nameString,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
@@ -1200,7 +1203,9 @@ Tcl_UpdateObjCmd(clientData, interp, objc, objv)
}
while (Tcl_DoOneEvent(flags) != 0) {
- /* Empty loop body */
+ if (Tcl_LimitExceeded(interp)) {
+ return TCL_ERROR;
+ }
}
/*