From: Mark Dickinson <dickinsm@gmail.com>
Date: Fri, 8 May 2009 20:59:57 +0000 (+0000)
Subject: Merged revisions 72479 via svnmerge from
X-Git-Tag: v2.6.3rc1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a451b61257996ed80836ea149a8662c0b52c72d;p=python

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).
........
---

diff --git a/Modules/resource.c b/Modules/resource.c
index d38c660e77..38974f95d0 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 = PyInt_AsLong(curobj);
-	if (rl.rlim_cur == -1 && PyErr_Occurred())
+	if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 	rl.rlim_max = PyInt_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) : PyInt_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) : PyInt_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)