mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Renamed a local variable from 'PyCFunction' (which is also a typedef

Browse source 
in methodobject.h) to 'func'.  /bin/cc on SunOS 4.x didn't grok this.
This commit is contained in:
Guido van Rossum 1997-05-20 22:09:08 +00:00
parent 59943ba718
commit a9040ec5d9
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/abstract.c
View file

@ -1034,7 +1034,7 @@ PyObject_CallMethod(va_alist) va_dcl
#endif
{
va_list va;
PyObject *args, *PyCFunction=0, *retval;
PyObject *args, *func=0, *retval;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
#else
@ -1053,15 +1053,15 @@ PyObject_CallMethod(va_alist) va_dcl
return Py_ReturnNullError();
}
PyCFunction=PyObject_GetAttrString(o,name);
if(! PyCFunction)
func=PyObject_GetAttrString(o,name);
if(! func)
{
va_end(va);
PyErr_SetString(PyExc_AttributeError,name);
return 0;
}
if(! (PyCallable_Check(PyCFunction)))
if(! (PyCallable_Check(func)))
{
va_end(va);
PyErr_SetString(PyExc_TypeError,"call of non-callable attribute");
@ -1086,9 +1086,9 @@ PyObject_CallMethod(va_alist) va_dcl
args=a;
}
retval = PyObject_CallObject(PyCFunction,args);
retval = PyObject_CallObject(func,args);
Py_DECREF(args);
Py_DECREF(PyCFunction);
Py_DECREF(func);
return retval;
}