Commit 583df7de authored by Neal Norwitz's avatar Neal Norwitz

Fix some Py_ssize_t issues

parent cca2c4a3
...@@ -717,7 +717,8 @@ element_deepcopy(ElementObject* self, PyObject* args) ...@@ -717,7 +717,8 @@ element_deepcopy(ElementObject* self, PyObject* args)
LOCAL(int) LOCAL(int)
checkpath(PyObject* tag) checkpath(PyObject* tag)
{ {
int i, check = 1; Py_ssize_t i;
int check = 1;
/* check if a tag contains an xpath character */ /* check if a tag contains an xpath character */
...@@ -1180,7 +1181,7 @@ static int ...@@ -1180,7 +1181,7 @@ static int
element_setslice(PyObject* self_, Py_ssize_t start, Py_ssize_t end, PyObject* item) element_setslice(PyObject* self_, Py_ssize_t start, Py_ssize_t end, PyObject* item)
{ {
ElementObject* self = (ElementObject*) self_; ElementObject* self = (ElementObject*) self_;
int i, new, old; Py_ssize_t i, new, old;
PyObject* recycle = NULL; PyObject* recycle = NULL;
if (!self->extra) if (!self->extra)
...@@ -1426,7 +1427,7 @@ typedef struct { ...@@ -1426,7 +1427,7 @@ typedef struct {
PyObject* data; /* data collector (string or list), or NULL */ PyObject* data; /* data collector (string or list), or NULL */
PyObject* stack; /* element stack */ PyObject* stack; /* element stack */
int index; /* current stack size (0=empty) */ Py_ssize_t index; /* current stack size (0=empty) */
/* element tracing */ /* element tracing */
PyObject* events; /* list of events, or NULL if not collecting */ PyObject* events; /* list of events, or NULL if not collecting */
...@@ -1606,7 +1607,7 @@ treebuilder_handle_data(TreeBuilderObject* self, PyObject* data) ...@@ -1606,7 +1607,7 @@ treebuilder_handle_data(TreeBuilderObject* self, PyObject* data)
PyString_CheckExact(data) && PyString_GET_SIZE(data) == 1) { PyString_CheckExact(data) && PyString_GET_SIZE(data) == 1) {
/* expat often generates single character data sections; handle /* expat often generates single character data sections; handle
the most common case by resizing the existing string... */ the most common case by resizing the existing string... */
int size = PyString_GET_SIZE(self->data); Py_ssize_t size = PyString_GET_SIZE(self->data);
if (_PyString_Resize(&self->data, size + 1) < 0) if (_PyString_Resize(&self->data, size + 1) < 0)
return NULL; return NULL;
PyString_AS_STRING(self->data)[size] = PyString_AS_STRING(data)[0]; PyString_AS_STRING(self->data)[size] = PyString_AS_STRING(data)[0];
...@@ -2456,7 +2457,7 @@ xmlparser_setevents(XMLParserObject* self, PyObject* args) ...@@ -2456,7 +2457,7 @@ xmlparser_setevents(XMLParserObject* self, PyObject* args)
{ {
/* activate element event reporting */ /* activate element event reporting */
int i; Py_ssize_t i;
TreeBuilderObject* target; TreeBuilderObject* target;
PyObject* events; /* event collector */ PyObject* events; /* event collector */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment