Fix warnings on 64-bit platforms about casts from pointers to ints.

gvanrossum · gvanrossum · commit 3475188ffe11 · 2002-09-12T14:43:41.000Z
Two of these were real bugs. git-svn-id: http://svn.python.org/projects/python/trunk@28670 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -437,7 +437,7 @@ new_arena(void)
 	arenabase = bp;
 	nfreepools = ARENA_SIZE / POOL_SIZE;
 	assert(POOL_SIZE * nfreepools == ARENA_SIZE);
-	excess = (uint)bp & POOL_SIZE_MASK;
+	excess = (uint) ((Py_uintptr_t)bp & POOL_SIZE_MASK);
 	if (excess != 0) {
 		--nfreepools;
 		arenabase += POOL_SIZE - excess;
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
@@ -3883,7 +3883,8 @@ PyString_Format(PyObject *format, PyObject *args)
 				PyErr_Format(PyExc_ValueError,
 				  "unsupported format character '%c' (0x%x) "
 				  "at index %i",
-				  c, c, fmt - 1 - PyString_AsString(format));
+				  c, c,
+				  (int)(fmt - 1 - PyString_AsString(format)));
 				goto error;
 			}
 			if (sign) {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -6465,7 +6465,8 @@ PyObject *PyUnicode_Format(PyObject *format,
 			     "unsupported format character '%c' (0x%x) "
 			     "at index %i",
 			     (31<=c && c<=126) ? c : '?', 
-                             c, fmt -1 - PyUnicode_AS_UNICODE(uformat));
+                             c,
+			     (int)(fmt -1 - PyUnicode_AS_UNICODE(uformat)));
 		goto onError;
 	    }
 	    if (sign) {
