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

trailing whitespace).
This commit is contained in:
Mark Dickinson 2009-05-08 20:58:08 +00:00
parent fd1ee7a8a0
commit 083d1f9f9a

View file

@ -159,20 +159,20 @@ 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