traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 72479 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72479 | mark.dickinson | 2009-05-08 21:58:08 +0100 (Fri, 08 May 2009) | 3 lines

  Issue #5933: Fix gcc -Wextra compiler warnings (and remove some
  trailing whitespace).
........
This commit is contained in:
Mark Dickinson 2009-05-08 21:01:57 +00:00
parent 928e04d87f
commit d8e821acaa
1 changed files with 6 additions and 6 deletions
Show Stats 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 = PyLong_AsLong(curobj); rl.rlim_cur = PyLong_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_AsLong(maxobj); rl.rlim_max = PyLong_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) : PyLong_AsLong(curobj); PyLong_AsLongLong(curobj) : PyLong_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) : PyLong_AsLong(maxobj); PyLong_AsLongLong(maxobj) : PyLong_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)