diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-04-13 07:52:27 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-04-13 07:52:27 (GMT) |
| commit | b1ed7fac12fe51080c06e518a9fcaa21f0734744 (patch) | |
| tree | 62ec01511606af98540d5b78bb24b2b848f4064e | |
| parent | 2a19074a9c58d491712139cd3607c10fddebbebc (diff) | |
| download | cpython-b1ed7fac12fe51080c06e518a9fcaa21f0734744.zip cpython-b1ed7fac12fe51080c06e518a9fcaa21f0734744.tar.gz cpython-b1ed7fac12fe51080c06e518a9fcaa21f0734744.tar.bz2 | |
Replace INT_MAX with PY_SSIZE_T_MAX.
| -rw-r--r-- | Modules/functionalmodule.c | 2 | ||||
| -rw-r--r-- | Objects/listobject.c | 4 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 5 | ||||
| -rw-r--r-- | Python/codecs.c | 10 | ||||
| -rw-r--r-- | Python/modsupport.c | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/Modules/functionalmodule.c b/Modules/functionalmodule.c index 4b2e9b4..38ef43a 100644 --- a/Modules/functionalmodule.c +++ b/Modules/functionalmodule.c @@ -48,7 +48,7 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw) 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); diff --git a/Objects/listobject.c b/Objects/listobject.c index a66371f..1debd23 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -181,7 +181,7 @@ ins1(PyListObject *self, Py_ssize_t where, PyObject *v) 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 @@ app1(PyListObject *self, PyObject *v) 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; diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index fe923ac..27b4811 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1746,14 +1746,13 @@ builtin_raw_input(PyObject *self, PyObject *args) } 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); diff --git a/Python/codecs.c b/Python/codecs.c index e2bb8fc..2124824 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -56,12 +56,12 @@ PyObject *normalizestring(const char *string) 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); diff --git a/Python/modsupport.c b/Python/modsupport.c index 77a25ea..65480c8 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -407,7 +407,7 @@ do_mkvalue(const char **p_format, va_list *p_va) 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; |