From 9079a1dab3c2e0624379fcbac05dc8fdb9bafde5 Mon Sep 17 00:00:00 2001 From: hobbs Date: Thu, 30 Aug 2001 19:02:43 +0000 Subject: * generic/tclIndexObj.c: fixed some casting problems that upset Crays. [Bug #419528] (andreasen) --- ChangeLog | 5 +++++ generic/tclIndexObj.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b22cac2..4e891de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-30 Jeff Hobbs + + * generic/tclIndexObj.c: fixed some casting problems that upset + Crays. [Bug #419528] (andreasen) + 2001-08-30 Don Porter * generic/tcl.h: Silence warning from Sun compiler. [Bug 454374] diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index 3c491dd..454bda6 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIndexObj.c,v 1.9 2001/05/26 01:25:59 msofer Exp $ + * RCS: @(#) $Id: tclIndexObj.c,v 1.10 2001/08/30 19:02:43 hobbs Exp $ */ #include "tclInt.h" @@ -177,7 +177,7 @@ Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, } for (entryPtr = tablePtr, i = 0; *entryPtr != NULL; - entryPtr = (char **) ((size_t) entryPtr + offset), i++) { + entryPtr = (char **) ((char *) entryPtr + offset), i++) { for (p1 = key, p2 = *entryPtr; *p1 == *p2; p1++, p2++) { if (*p1 == 0) { index = i; @@ -222,10 +222,10 @@ Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, Tcl_AppendStringsToObj(resultPtr, (numAbbrev > 1) ? "ambiguous " : "bad ", msg, " \"", key, "\": must be ", *tablePtr, (char *) NULL); - for (entryPtr = (char **) ((size_t) tablePtr + offset), count = 0; + for (entryPtr = (char **) ((char *) tablePtr + offset), count = 0; *entryPtr != NULL; - entryPtr = (char **) ((size_t) entryPtr + offset), count++) { - if ((*((char **) ((size_t) entryPtr + offset))) == NULL) { + entryPtr = (char **) ((char *) entryPtr + offset), count++) { + if ((*((char **) ((char *) entryPtr + offset))) == NULL) { Tcl_AppendStringsToObj(resultPtr, (count > 0) ? ", or " : " or ", *entryPtr, (char *) NULL); -- cgit v0.12