Skip to content

bpo-9566: Fix size_t=>int downcast warnings #5230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Jan 18, 2018
Merged

bpo-9566: Fix size_t=>int downcast warnings #5230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329ce1d
bpo-9566: Fix size_t=>int downcast warnings
vstinner Jan 18, 2018
f7c58fc
Fix gc.get_freeze_count(): use Py_ssize_t internally
vstinner Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Modules/clinic/gcmodule.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,22 +307,22 @@ PyDoc_STRVAR(gc_get_freeze_count__doc__,
#define GC_GET_FREEZE_COUNT_METHODDEF \
{"get_freeze_count", (PyCFunction)gc_get_freeze_count, METH_NOARGS, gc_get_freeze_count__doc__},

static int
static Py_ssize_t
gc_get_freeze_count_impl(PyObject *module);

static PyObject *
gc_get_freeze_count(PyObject *module, PyObject *Py_UNUSED(ignored))
{
PyObject *return_value = NULL;
int _return_value;
Py_ssize_t _return_value;

_return_value = gc_get_freeze_count_impl(module);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyLong_FromLong((long)_return_value);
return_value = PyLong_FromSsize_t(_return_value);

exit:
return return_value;
}
/*[clinic end generated code: output=6f9ee4d8dd1f36c1 input=a9049054013a1b77]*/
/*[clinic end generated code: output=21dc9270b10b7891 input=a9049054013a1b77]*/
6 changes: 3 additions & 3 deletions Modules/gcmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,14 +1449,14 @@ gc_unfreeze_impl(PyObject *module)
}

/*[clinic input]
gc.get_freeze_count -> int
gc.get_freeze_count -> Py_ssize_t

Return the number of objects in the permanent generation.
[clinic start generated code]*/

static int
static Py_ssize_t
gc_get_freeze_count_impl(PyObject *module)
/*[clinic end generated code: output=e4e2ebcc77e5cbf3 input=4b759db880a3c6e4]*/
/*[clinic end generated code: output=61cbd9f43aa032e1 input=45ffbc65cfe2a6ed]*/
{
return gc_list_size(&_PyRuntime.gc.permanent_generation.head);
}
Expand Down
2 changes: 1 addition & 1 deletion Python/ast_opt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ fold_compare(expr_ty node, PyArena *arena, int optimize)
{
asdl_int_seq *ops;
asdl_seq *args;
int i;
Py_ssize_t i;

ops = node->v.Compare.ops;
args = node->v.Compare.comparators;
Expand Down
4 changes: 2 additions & 2 deletions Python/bltinmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ _Py_IDENTIFIER(stderr);
#include "clinic/bltinmodule.c.h"

static PyObject*
update_bases(PyObject *bases, PyObject *const *args, int nargs)
update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
{
int i, j;
Py_ssize_t i, j;
PyObject *base, *meth, *new_base, *result, *new_bases = NULL;
PyObject *stack[1] = {bases};
assert(PyTuple_Check(bases));
Expand Down
8 changes: 4 additions & 4 deletions Python/pathconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,13 +367,12 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
fseek(env_file, 0, SEEK_SET);
while (!feof(env_file)) {
char * p = fgets(buffer, MAXPATHLEN*2, env_file);
wchar_t *tmpbuffer;
int n;

if (p == NULL) {
break;
}
n = strlen(p);

size_t n = strlen(p);
if (p[n - 1] != '\n') {
/* line has overflowed - bail */
break;
Expand All @@ -382,7 +381,8 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
/* Comment - skip */
continue;
}
tmpbuffer = _Py_DecodeUTF8_surrogateescape(buffer, n);

wchar_t *tmpbuffer = _Py_DecodeUTF8_surrogateescape(buffer, n);
if (tmpbuffer) {
wchar_t * state;
wchar_t * tok = wcstok(tmpbuffer, L" \t\r\n", &state);
Expand Down