Kaydet (Commit) 7a6d7cf3 authored tarafından Victor Stinner's avatar Victor Stinner

Issue #9566: Use the right type to fix a compiler warnings on Win64

üst 56cb1254
...@@ -1865,7 +1865,7 @@ static PyObject* ...@@ -1865,7 +1865,7 @@ static PyObject*
pattern_match(PatternObject* self, PyObject* args, PyObject* kw) pattern_match(PatternObject* self, PyObject* args, PyObject* kw)
{ {
SRE_STATE state; SRE_STATE state;
int status; Py_ssize_t status;
PyObject* string; PyObject* string;
Py_ssize_t start = 0; Py_ssize_t start = 0;
...@@ -2034,7 +2034,7 @@ pattern_findall(PatternObject* self, PyObject* args, PyObject* kw) ...@@ -2034,7 +2034,7 @@ pattern_findall(PatternObject* self, PyObject* args, PyObject* kw)
{ {
SRE_STATE state; SRE_STATE state;
PyObject* list; PyObject* list;
int status; Py_ssize_t status;
Py_ssize_t i, b, e; Py_ssize_t i, b, e;
PyObject* string; PyObject* string;
...@@ -2160,7 +2160,7 @@ pattern_split(PatternObject* self, PyObject* args, PyObject* kw) ...@@ -2160,7 +2160,7 @@ pattern_split(PatternObject* self, PyObject* args, PyObject* kw)
SRE_STATE state; SRE_STATE state;
PyObject* list; PyObject* list;
PyObject* item; PyObject* item;
int status; Py_ssize_t status;
Py_ssize_t n; Py_ssize_t n;
Py_ssize_t i; Py_ssize_t i;
void* last; void* last;
...@@ -2276,7 +2276,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string, ...@@ -2276,7 +2276,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string,
PyObject* args; PyObject* args;
PyObject* match; PyObject* match;
void* ptr; void* ptr;
int status; Py_ssize_t status;
Py_ssize_t n; Py_ssize_t n;
Py_ssize_t i, b, e; Py_ssize_t i, b, e;
int logical_charsize, charsize; int logical_charsize, charsize;
...@@ -2295,7 +2295,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string, ...@@ -2295,7 +2295,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string,
ptr = getstring(ptemplate, &n, &logical_charsize, &charsize, &view); ptr = getstring(ptemplate, &n, &logical_charsize, &charsize, &view);
b = charsize; b = charsize;
if (ptr) { if (ptr) {
literal = sre_literal_template(b, ptr, n); literal = sre_literal_template(charsize, ptr, n);
} else { } else {
PyErr_Clear(); PyErr_Clear();
literal = 0; literal = 0;
...@@ -3721,7 +3721,7 @@ scanner_match(ScannerObject* self, PyObject *unused) ...@@ -3721,7 +3721,7 @@ scanner_match(ScannerObject* self, PyObject *unused)
{ {
SRE_STATE* state = &self->state; SRE_STATE* state = &self->state;
PyObject* match; PyObject* match;
int status; Py_ssize_t status;
state_reset(state); state_reset(state);
...@@ -3752,7 +3752,7 @@ scanner_search(ScannerObject* self, PyObject *unused) ...@@ -3752,7 +3752,7 @@ scanner_search(ScannerObject* self, PyObject *unused)
{ {
SRE_STATE* state = &self->state; SRE_STATE* state = &self->state;
PyObject* match; PyObject* match;
int status; Py_ssize_t status;
state_reset(state); state_reset(state);
......
...@@ -466,7 +466,7 @@ static int ...@@ -466,7 +466,7 @@ static int
frame_traverse(PyFrameObject *f, visitproc visit, void *arg) frame_traverse(PyFrameObject *f, visitproc visit, void *arg)
{ {
PyObject **fastlocals, **p; PyObject **fastlocals, **p;
int i, slots; Py_ssize_t i, slots;
Py_VISIT(f->f_back); Py_VISIT(f->f_back);
Py_VISIT(f->f_code); Py_VISIT(f->f_code);
...@@ -496,7 +496,7 @@ static void ...@@ -496,7 +496,7 @@ static void
frame_clear(PyFrameObject *f) frame_clear(PyFrameObject *f)
{ {
PyObject **fastlocals, **p, **oldtop; PyObject **fastlocals, **p, **oldtop;
int i, slots; Py_ssize_t i, slots;
/* Before anything else, make sure that this frame is clearly marked /* Before anything else, make sure that this frame is clearly marked
* as being defunct! Else, e.g., a generator reachable from this * as being defunct! Else, e.g., a generator reachable from this
...@@ -848,7 +848,7 @@ PyFrame_FastToLocals(PyFrameObject *f) ...@@ -848,7 +848,7 @@ PyFrame_FastToLocals(PyFrameObject *f)
PyObject *error_type, *error_value, *error_traceback; PyObject *error_type, *error_value, *error_traceback;
PyCodeObject *co; PyCodeObject *co;
Py_ssize_t j; Py_ssize_t j;
int ncells, nfreevars; Py_ssize_t ncells, nfreevars;
if (f == NULL) if (f == NULL)
return; return;
locals = f->f_locals; locals = f->f_locals;
...@@ -900,7 +900,7 @@ PyFrame_LocalsToFast(PyFrameObject *f, int clear) ...@@ -900,7 +900,7 @@ PyFrame_LocalsToFast(PyFrameObject *f, int clear)
PyObject *error_type, *error_value, *error_traceback; PyObject *error_type, *error_value, *error_traceback;
PyCodeObject *co; PyCodeObject *co;
Py_ssize_t j; Py_ssize_t j;
int ncells, nfreevars; Py_ssize_t ncells, nfreevars;
if (f == NULL) if (f == NULL)
return; return;
locals = f->f_locals; locals = f->f_locals;
......
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