[Python-checkins] r42414 - python/trunk/Python/bltinmodule.c python/trunk/Python/errors.c python/trunk/Python/getargs.c python/trunk/Python/modsupport.c python/trunk/Python/symtable.c python/trunk/Python/sysmodule.c python/trunk/Python/traceback.c
martin.v.loewis
python-checkins at python.org
Thu Feb 16 15:37:16 CET 2006
Author: martin.v.loewis
Date: Thu Feb 16 15:37:16 2006
New Revision: 42414
Modified:
python/trunk/Python/bltinmodule.c
python/trunk/Python/errors.c
python/trunk/Python/getargs.c
python/trunk/Python/modsupport.c
python/trunk/Python/symtable.c
python/trunk/Python/sysmodule.c
python/trunk/Python/traceback.c
Log:
Use Py_ssize_t to count the
Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c (original)
+++ python/trunk/Python/bltinmodule.c Thu Feb 16 15:37:16 2006
@@ -193,8 +193,8 @@
builtin_filter(PyObject *self, PyObject *args)
{
PyObject *func, *seq, *result, *it, *arg;
- int len; /* guess for result list size */
- register int j;
+ Py_ssize_t len; /* guess for result list size */
+ register Py_ssize_t j;
if (!PyArg_UnpackTuple(args, "filter", 2, 2, &func, &seq))
return NULL;
@@ -860,7 +860,7 @@
len = 0;
for (i = 0, sqp = seqs; i < n; ++i, ++sqp) {
PyObject *curseq;
- int curlen;
+ Py_ssize_t curlen;
/* Get iterator. */
curseq = PyTuple_GetItem(args, i+1);
@@ -1338,7 +1338,7 @@
builtin_ord(PyObject *self, PyObject* obj)
{
long ord;
- int size;
+ Py_ssize_t size;
if (PyString_Check(obj)) {
size = PyString_GET_SIZE(obj);
@@ -1363,7 +1363,7 @@
PyErr_Format(PyExc_TypeError,
"ord() expected a character, "
- "but string of length %d found",
+ "but string of length %zd found",
size);
return NULL;
}
@@ -2094,10 +2094,10 @@
builtin_zip(PyObject *self, PyObject *args)
{
PyObject *ret;
- const int itemsize = PySequence_Length(args);
- int i;
+ const Py_ssize_t itemsize = PySequence_Length(args);
+ Py_ssize_t i;
PyObject *itlist; /* tuple of iterators */
- int len; /* guess at result length */
+ Py_ssize_t len; /* guess at result length */
if (itemsize == 0)
return PyList_New(0);
@@ -2111,7 +2111,7 @@
len = -1; /* unknown */
for (i = 0; i < itemsize; ++i) {
PyObject *item = PyTuple_GET_ITEM(args, i);
- int thislen = _PyObject_LengthHint(item);
+ Py_ssize_t thislen = _PyObject_LengthHint(item);
if (thislen < 0) {
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
!PyErr_ExceptionMatches(PyExc_AttributeError)) {
@@ -2460,7 +2460,7 @@
Py_DECREF(good);
}
if (ok) {
- int reslen;
+ Py_ssize_t reslen;
if (!PyString_Check(item)) {
PyErr_SetString(PyExc_TypeError, "can't filter str to str:"
" __getitem__ returned different type");
@@ -2473,7 +2473,7 @@
PyString_AS_STRING(item)[0];
} else {
/* do we need more space? */
- int need = j + reslen + len-i-1;
+ Py_ssize_t need = j + reslen + len-i-1;
if (need > outlen) {
/* overallocate, to avoid reallocations */
if (need<2*outlen)
@@ -2513,8 +2513,8 @@
{
PyObject *result;
register int i, j;
- int len = PyUnicode_GetSize(strobj);
- int outlen = len;
+ Py_ssize_t len = PyUnicode_GetSize(strobj);
+ Py_ssize_t outlen = len;
if (func == Py_None) {
/* If it's a real string we can return the original,
@@ -2554,7 +2554,7 @@
Py_DECREF(good);
}
if (ok) {
- int reslen;
+ Py_ssize_t reslen;
if (!PyUnicode_Check(item)) {
PyErr_SetString(PyExc_TypeError,
"can't filter unicode to unicode:"
@@ -2568,7 +2568,7 @@
PyUnicode_AS_UNICODE(item)[0];
else {
/* do we need more space? */
- int need = j + reslen + len - i - 1;
+ Py_ssize_t need = j + reslen + len - i - 1;
if (need > outlen) {
/* overallocate,
to avoid reallocations */
Modified: python/trunk/Python/errors.c
==============================================================================
--- python/trunk/Python/errors.c (original)
+++ python/trunk/Python/errors.c Thu Feb 16 15:37:16 2006
@@ -83,7 +83,7 @@
return 0;
}
if (PyTuple_Check(exc)) {
- int i, n;
+ Py_ssize_t i, n;
n = PyTuple_Size(exc);
for (i = 0; i < n; i++) {
/* Test recursively */
Modified: python/trunk/Python/getargs.c
==============================================================================
--- python/trunk/Python/getargs.c (original)
+++ python/trunk/Python/getargs.c Thu Feb 16 15:37:16 2006
@@ -153,7 +153,7 @@
{
if(freelist) {
if((retval) == 0) {
- int len = PyList_GET_SIZE(freelist), i;
+ Py_ssize_t len = PyList_GET_SIZE(freelist), i;
for (i = 0; i < len; i++)
PyMem_FREE(PyCObject_AsVoidPtr(
PyList_GET_ITEM(freelist, i)));
@@ -176,7 +176,7 @@
int level = 0;
int endfmt = 0;
const char *formatsave = format;
- int i, len;
+ Py_ssize_t i, len;
char *msg;
PyObject *freelist = NULL;
int compat = flags & FLAG_COMPAT;
Modified: python/trunk/Python/modsupport.c
==============================================================================
--- python/trunk/Python/modsupport.c (original)
+++ python/trunk/Python/modsupport.c Thu Feb 16 15:37:16 2006
@@ -315,7 +315,7 @@
case 'n':
#if SIZEOF_SIZE_T!=SIZEOF_LONG
- return PyLong_FromSsize_t(va_arg(*p_va, Py_Ssize_t));
+ return PyInt_FromSsize_t(va_arg(*p_va, Py_ssize_t));
#endif
/* Fall through from 'n' to 'l' if Py_ssize_t is long */
case 'l':
Modified: python/trunk/Python/symtable.c
==============================================================================
--- python/trunk/Python/symtable.c (original)
+++ python/trunk/Python/symtable.c Thu Feb 16 15:37:16 2006
@@ -715,7 +715,7 @@
static int
symtable_exit_block(struct symtable *st, void *ast)
{
- int end;
+ Py_ssize_t end;
Py_DECREF(st->st_cur);
end = PyList_GET_SIZE(st->st_stack) - 1;
Modified: python/trunk/Python/sysmodule.c
==============================================================================
--- python/trunk/Python/sysmodule.c (original)
+++ python/trunk/Python/sysmodule.c Thu Feb 16 15:37:16 2006
@@ -947,7 +947,8 @@
svnversion_init(void)
{
const char *python, *br_start, *br_end, *br_end2, *svnversion;
- int len, istag;
+ Py_ssize_t len;
+ int istag;
if (svn_initialized)
return;
Modified: python/trunk/Python/traceback.c
==============================================================================
--- python/trunk/Python/traceback.c (original)
+++ python/trunk/Python/traceback.c Thu Feb 16 15:37:16 2006
@@ -153,7 +153,8 @@
tail++;
path = PySys_GetObject("path");
if (path != NULL && PyList_Check(path)) {
- int npath = PyList_Size(path);
+ Py_ssize_t _npath = PyList_Size(path);
+ int npath = Py_SAFE_DOWNCAST(_npath, Py_ssize_t, int);
size_t taillen = strlen(tail);
char namebuf[MAXPATHLEN+1];
for (i = 0; i < npath; i++) {
More information about the Python-checkins
mailing list