diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-05-08 21:01:57 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-05-08 21:01:57 (GMT) |
| commit | d8e821acaa600c7503ab76bda904024aff808f9a (patch) | |
| tree | f6a82da9764ddd5cec50b80a395abfb0dae5e8e7 /Modules/resource.c | |
| parent | 928e04d87ff52ee45fbca8be9bc9322d9c241d34 (diff) | |
| download | cpython-d8e821acaa600c7503ab76bda904024aff808f9a.zip cpython-d8e821acaa600c7503ab76bda904024aff808f9a.tar.gz cpython-d8e821acaa600c7503ab76bda904024aff808f9a.tar.bz2 | |
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).
........
Diffstat (limited to 'Modules/resource.c')
| -rw-r--r-- | Modules/resource.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/resource.c b/Modules/resource.c index 294ea92..facb7d9 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -147,7 +147,7 @@ resource_setrlimit(PyObject *self, PyObject *args) int resource; PyObject *curobj, *maxobj; - if (!PyArg_ParseTuple(args, "i(OO):setrlimit", + if (!PyArg_ParseTuple(args, "i(OO):setrlimit", &resource, &curobj, &maxobj)) return NULL; @@ -159,27 +159,27 @@ resource_setrlimit(PyObject *self, PyObject *args) #if !defined(HAVE_LARGEFILE_SUPPORT) rl.rlim_cur = PyLong_AsLong(curobj); - if (rl.rlim_cur == -1 && PyErr_Occurred()) + if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred()) return NULL; rl.rlim_max = PyLong_AsLong(maxobj); - if (rl.rlim_max == -1 && PyErr_Occurred()) + if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred()) return NULL; #else /* The limits are probably bigger than a long */ rl.rlim_cur = PyLong_Check(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; rl.rlim_max = PyLong_Check(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; #endif rl.rlim_cur = rl.rlim_cur & RLIM_INFINITY; rl.rlim_max = rl.rlim_max & RLIM_INFINITY; if (setrlimit(resource, &rl) == -1) { - if (errno == EINVAL) + if (errno == EINVAL) PyErr_SetString(PyExc_ValueError, "current limit exceeds maximum limit"); else if (errno == EPERM) |