merge novem

1 files changed, 14 insertions, 14 deletions

diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index a11f25a..66d4578 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -47,15 +47,15 @@
  */
 
 typedef struct {
-    int numChars;		/* The number of chars in the string. -1 means
-				 * this value has not been calculated. >= 0
+    size_t numChars;	/* The number of chars in the string. (size_t)-1 means
+				 * this value has not been calculated. Any other
 				 * means that there is a valid Unicode rep, or
 				 * that the number of UTF bytes == the number
 				 * of chars. */
-    int allocated;	/* The amount of space actually allocated for
+    size_t allocated;		/* The amount of space actually allocated for
 				 * the UTF string (minus 1 byte for the
 				 * termination char). */
-    int maxChars;	/* Max number of chars that can fit in the
+    size_t maxChars;		/* Max number of chars that can fit in the
 				 * space allocated for the unicode array. */
     int hasUnicode;		/* Boolean determining whether the string has
 				 * a Unicode representation. */
@@ -65,24 +65,24 @@ typedef struct {
 } String;
 
 #define STRING_MAXCHARS \
-    (((size_t)UINT_MAX - sizeof(String))/sizeof(Tcl_UniChar))
+    ((UINT_MAX - sizeof(String))/sizeof(Tcl_UniChar))
 #define STRING_SIZE(numChars) \
     (sizeof(String) + ((numChars) * sizeof(Tcl_UniChar)))
 #define stringCheckLimits(numChars) \
-    do {                                                               \
-	if ((size_t)(numChars) > STRING_MAXCHARS) {           \
-	    Tcl_Panic("max length for a Tcl unicode value (%d chars) exceeded", \
-			  (int)STRING_MAXCHARS);                                 \
-	}                                                               \
+    do {								\
+	if ((size_t)(numChars) > STRING_MAXCHARS) {		\
+	    Tcl_Panic("max length for a Tcl unicode value (%" TCL_LL_MODIFIER "d chars) exceeded", \
+		      (Tcl_WideInt)STRING_MAXCHARS);					\
+	}								\
     } while (0)
 #define stringAttemptAlloc(numChars) \
-    (String *) attemptckalloc(STRING_SIZE(numChars) )
+    (String *) attemptckalloc(STRING_SIZE(numChars))
 #define stringAlloc(numChars) \
-    (String *) ckalloc(STRING_SIZE(numChars) )
+    (String *) ckalloc(STRING_SIZE(numChars))
 #define stringRealloc(ptr, numChars) \
-    (String *) ckrealloc((ptr), STRING_SIZE(numChars) )
+    (String *) ckrealloc((ptr), STRING_SIZE(numChars))
 #define stringAttemptRealloc(ptr, numChars) \
-    (String *) attemptckrealloc((ptr), STRING_SIZE(numChars) )
+    (String *) attemptckrealloc((ptr), STRING_SIZE(numChars))
 #define GET_STRING(objPtr) \
     ((String *) (objPtr)->internalRep.twoPtrValue.ptr1)
 #define SET_STRING(objPtr, stringPtr) \