summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-16 09:16:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-16 09:16:39 (GMT)
commit0013597b33c5df5a4239d2fc042d9eeb597e94e0 (patch)
tree90947f076535ea5ba5b78470d19149ca9d52ffe0
parentc54d29df06056eda6a5dd8c5845283204d56418f (diff)
downloadtcl-0013597b33c5df5a4239d2fc042d9eeb597e94e0.zip
tcl-0013597b33c5df5a4239d2fc042d9eeb597e94e0.tar.gz
tcl-0013597b33c5df5a4239d2fc042d9eeb597e94e0.tar.bz2
Fix gcc warnings
-rw-r--r--generic/tclThreadAlloc.c2
-rw-r--r--generic/tclZipfs.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 28475f9..727f061 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -564,7 +564,7 @@ TclThreadAllocObj(void)
cachePtr->numObjects = numMove = NOBJALLOC;
newObjsPtr = (Tcl_Obj *)TclpSysAlloc(sizeof(Tcl_Obj) * numMove, 0);
if (newObjsPtr == NULL) {
- Tcl_Panic("alloc: could not allocate %ld new objects", numMove);
+ Tcl_Panic("alloc: could not allocate %" TCL_Z_MODIFIER "u new objects", numMove);
}
cachePtr->lastPtr = newObjsPtr + numMove - 1;
objPtr = cachePtr->firstObjPtr; /* NULL */
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index ee166f8..a3e1304 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -1449,9 +1449,8 @@ ZipFSCatalogFilesystem(
* Validate the TOC data. If that's bad, things fall apart.
*/
- if (zf0->baseOffset < 0 || zf0->baseOffset >= zf0->length ||
- zf0->passOffset < 0 || zf0->passOffset >= zf0->length ||
- zf0->directoryOffset < 0 || zf0->directoryOffset >= zf0->length) {
+ if (zf0->baseOffset >= zf0->length || zf0->passOffset >= zf0->length ||
+ zf0->directoryOffset >= zf0->length) {
ZIPFS_ERROR(interp, "bad zip data");
ZIPFS_ERROR_CODE(interp, "BAD_ZIP");
return TCL_ERROR;