mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-17 14:16:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #5933: Fix gcc -Wextra compiler warnings (and remove some

Browse source 
trailing whitespace).
This commit is contained in:
Mark Dickinson 2009-05-08 20:58:08 +00:00
parent fd1ee7a8a0
commit 083d1f9f9a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/resource.c
View file

@ -147,7 +147,7 @@ resource_setrlimit(PyObject *self, PyObject *args)
int resource; int resource;
PyObject *curobj, *maxobj; PyObject *curobj, *maxobj;
if (!PyArg_ParseTuple(args, "i(OO):setrlimit", if (!PyArg_ParseTuple(args, "i(OO):setrlimit",
&resource, &curobj, &maxobj)) &resource, &curobj, &maxobj))
return NULL; return NULL;
@ -159,27 +159,27 @@ resource_setrlimit(PyObject *self, PyObject *args)
#if !defined(HAVE_LARGEFILE_SUPPORT) #if !defined(HAVE_LARGEFILE_SUPPORT)
rl.rlim_cur = PyInt_AsLong(curobj); rl.rlim_cur = PyInt_AsLong(curobj);
if (rl.rlim_cur == -1 && PyErr_Occurred()) if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
return NULL; return NULL;
rl.rlim_max = PyInt_AsLong(maxobj); rl.rlim_max = PyInt_AsLong(maxobj);
if (rl.rlim_max == -1 && PyErr_Occurred()) if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred())
return NULL; return NULL;
#else #else
/* The limits are probably bigger than a long */ /* The limits are probably bigger than a long */
rl.rlim_cur = PyLong_Check(curobj) ? rl.rlim_cur = PyLong_Check(curobj) ?
PyLong_AsLongLong(curobj) : PyInt_AsLong(curobj); PyLong_AsLongLong(curobj) : PyInt_AsLong(curobj);
if (rl.rlim_cur == -1 && PyErr_Occurred()) if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
return NULL; return NULL;
rl.rlim_max = PyLong_Check(maxobj) ? rl.rlim_max = PyLong_Check(maxobj) ?
PyLong_AsLongLong(maxobj) : PyInt_AsLong(maxobj); PyLong_AsLongLong(maxobj) : PyInt_AsLong(maxobj);
if (rl.rlim_max == -1 && PyErr_Occurred()) if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred())
return NULL; return NULL;
#endif #endif
rl.rlim_cur = rl.rlim_cur & RLIM_INFINITY; rl.rlim_cur = rl.rlim_cur & RLIM_INFINITY;
rl.rlim_max = rl.rlim_max & RLIM_INFINITY; rl.rlim_max = rl.rlim_max & RLIM_INFINITY;
if (setrlimit(resource, &rl) == -1) { if (setrlimit(resource, &rl) == -1) {
if (errno == EINVAL) if (errno == EINVAL)
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"current limit exceeds maximum limit"); "current limit exceeds maximum limit");
else if (errno == EPERM) else if (errno == EPERM)