1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup and correct a few ints to be Py_ssize_t.

Browse Source
This commit is contained in:
Brian Curtin 2010-08-17 20:49:09 +00:00
parent abb3351785
commit 852823d731
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PC/_subprocess.c
View File

@ -329,7 +329,8 @@ gethandle(PyObject* obj, char* name)
static PyObject* static PyObject*
getenvironment(PyObject* environment) getenvironment(PyObject* environment)
{ {
int i, envsize; int i;
Py_ssize_t envsize;
PyObject* out = NULL; PyObject* out = NULL;
PyObject* keys; PyObject* keys;
PyObject* values; PyObject* values;
@ -356,7 +357,7 @@ getenvironment(PyObject* environment)
p = PyUnicode_AS_UNICODE(out); p = PyUnicode_AS_UNICODE(out);
for (i = 0; i < envsize; i++) { for (i = 0; i < envsize; i++) {
int ksize, vsize, totalsize; Py_ssize_t ksize, vsize, totalsize;
PyObject* key = PyList_GET_ITEM(keys, i); PyObject* key = PyList_GET_ITEM(keys, i);
PyObject* value = PyList_GET_ITEM(values, i); PyObject* value = PyList_GET_ITEM(values, i);
@ -370,7 +371,7 @@ getenvironment(PyObject* environment)
totalsize = (p - PyUnicode_AS_UNICODE(out)) + ksize + 1 + totalsize = (p - PyUnicode_AS_UNICODE(out)) + ksize + 1 +
vsize + 1 + 1; vsize + 1 + 1;
if (totalsize > PyUnicode_GET_SIZE(out)) { if (totalsize > PyUnicode_GET_SIZE(out)) {
int offset = p - PyUnicode_AS_UNICODE(out); Py_ssize_t offset = p - PyUnicode_AS_UNICODE(out);
PyUnicode_Resize(&out, totalsize + 1024); PyUnicode_Resize(&out, totalsize + 1024);
p = PyUnicode_AS_UNICODE(out) + offset; p = PyUnicode_AS_UNICODE(out) + offset;
} }