From: Roger E. Masse <rmasse@newcnri.cnri.reston.va.us>
Date: Wed, 18 Dec 1996 20:07:39 +0000 (+0000)
Subject: Eradicated all references to getintarg and getstrarg and substituded the
X-Git-Tag: v1.5a1~697
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec0b4af3d4d92c174a421967175672e73189531f;p=python

Eradicated all references to getintarg and getstrarg and substituded the
proper functions as defined in rename2.h.  Thanks Barry!
---

diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index 23f28f5e91..ccdba12524 100644
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -36,9 +36,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <sys/types.h>
 #include <grp.h>
 
-#define getintarg(v,a) PyArg_Parse((v),"i",(a))
-#define getstrarg(v,a) PyArg_Parse((v),"s",(a))
-
 static PyObject *mkgrent(p)
 	struct group *p;
 {
@@ -75,7 +72,7 @@ static PyObject *grp_getgrgid(self, args)
 {
 	int gid;
 	struct group *p;
-	if (!getintarg(args, &gid))
+	if (!PyArg_Parse((args),"i",(&gid)))
 		return NULL;
 	if ((p = getgrgid(gid)) == NULL) {
 		PyErr_SetString(PyExc_KeyError, "getgrgid(): gid not found");
@@ -89,7 +86,7 @@ static PyObject *grp_getgrnam(self, args)
 {
 	char *name;
 	struct group *p;
-	if (!getstrarg(args, &name))
+	if (!PyArg_Parse((args),"s",(&name)))
 		return NULL;
 	if ((p = getgrnam(name)) == NULL) {
 		PyErr_SetString(PyExc_KeyError, "getgrnam(): name not found");