[Python-checkins] r45348 - in python/trunk: Modules/functionalmodule.c Objects/listobject.c Python/bltinmodule.c Python/codecs.c Python/modsupport.c
martin.v.loewis
python-checkins at python.org
Thu Apr 13 09:52:28 CEST 2006
Author: martin.v.loewis
Date: Thu Apr 13 09:52:27 2006
New Revision: 45348
Modified:
python/trunk/Modules/functionalmodule.c
python/trunk/Objects/listobject.c
python/trunk/Python/bltinmodule.c
python/trunk/Python/codecs.c
python/trunk/Python/modsupport.c
Log:
Replace INT_MAX with PY_SSIZE_T_MAX.
Modified: python/trunk/Modules/functionalmodule.c
==============================================================================
--- python/trunk/Modules/functionalmodule.c (original)
+++ python/trunk/Modules/functionalmodule.c Thu Apr 13 09:52:27 2006
@@ -48,7 +48,7 @@
pto->fn = func;
Py_INCREF(func);
- pto->args = PyTuple_GetSlice(args, 1, INT_MAX);
+ pto->args = PyTuple_GetSlice(args, 1, PY_SSIZE_T_MAX);
if (pto->args == NULL) {
pto->kw = NULL;
Py_DECREF(pto);
Modified: python/trunk/Objects/listobject.c
==============================================================================
--- python/trunk/Objects/listobject.c (original)
+++ python/trunk/Objects/listobject.c Thu Apr 13 09:52:27 2006
@@ -181,7 +181,7 @@
PyErr_BadInternalCall();
return -1;
}
- if (n == INT_MAX) {
+ if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to list");
return -1;
@@ -221,7 +221,7 @@
Py_ssize_t n = PyList_GET_SIZE(self);
assert (v != NULL);
- if (n == INT_MAX) {
+ if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to list");
return -1;
Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c (original)
+++ python/trunk/Python/bltinmodule.c Thu Apr 13 09:52:27 2006
@@ -1746,14 +1746,13 @@
}
else { /* strip trailing '\n' */
size_t len = strlen(s);
- if (len > INT_MAX) {
+ if (len > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
"[raw_]input: input too long");
result = NULL;
}
else {
- result = PyString_FromStringAndSize(s,
- (int)(len-1));
+ result = PyString_FromStringAndSize(s, len-1);
}
}
PyMem_FREE(s);
Modified: python/trunk/Python/codecs.c
==============================================================================
--- python/trunk/Python/codecs.c (original)
+++ python/trunk/Python/codecs.c Thu Apr 13 09:52:27 2006
@@ -56,12 +56,12 @@
char *p;
PyObject *v;
- if (len > INT_MAX) {
- PyErr_SetString(PyExc_OverflowError, "string is too large");
- return NULL;
- }
+ if (len > PY_SSIZE_T_MAX) {
+ PyErr_SetString(PyExc_OverflowError, "string is too large");
+ return NULL;
+ }
- v = PyString_FromStringAndSize(NULL, (int)len);
+ v = PyString_FromStringAndSize(NULL, len);
if (v == NULL)
return NULL;
p = PyString_AS_STRING(v);
Modified: python/trunk/Python/modsupport.c
==============================================================================
--- python/trunk/Python/modsupport.c (original)
+++ python/trunk/Python/modsupport.c Thu Apr 13 09:52:27 2006
@@ -407,7 +407,7 @@
else {
if (n < 0) {
size_t m = strlen(str);
- if (m > INT_MAX) {
+ if (m > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
"string too long for Python string");
return NULL;
More information about the Python-checkins
mailing list