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

gvanrossum · gvanrossum · commit a9040ec5d9dc · 1997-05-20T22:09:08.000Z
in methodobject.h) to 'func'.  /bin/cc on SunOS 4.x didn't grok this.
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ PyObject_CallMethod(va_alist) va_dcl`
`1034`	`1034`	`#endif`
`1035`	`1035`	`{`
`1036`	`1036`	`va_list va;`
`1037`		`- PyObject args, PyCFunction=0, *retval;`
	`1037`	`+ PyObject args, func=0, *retval;`
`1038`	`1038`	`#ifdef HAVE_STDARG_PROTOTYPES`
`1039`	`1039`	`va_start(va, format);`
`1040`	`1040`	`#else`
`@@ -1053,15 +1053,15 @@ PyObject_CallMethod(va_alist) va_dcl`
`1053`	`1053`	`return Py_ReturnNullError();`
`1054`	`1054`	`}`
`1055`	`1055`
`1056`		`- PyCFunction=PyObject_GetAttrString(o,name);`
`1057`		`- if(! PyCFunction)`
	`1056`	`+ func=PyObject_GetAttrString(o,name);`
	`1057`	`+ if(! func)`
`1058`	`1058`	`{`
`1059`	`1059`	`va_end(va);`
`1060`	`1060`	`PyErr_SetString(PyExc_AttributeError,name);`
`1061`	`1061`	`return 0;`
`1062`	`1062`	`}`
`1063`	`1063`
`1064`		`- if(! (PyCallable_Check(PyCFunction)))`
	`1064`	`+ if(! (PyCallable_Check(func)))`
`1065`	`1065`	`{`
`1066`	`1066`	`va_end(va);`
`1067`	`1067`	`PyErr_SetString(PyExc_TypeError,"call of non-callable attribute");`
`@@ -1086,9 +1086,9 @@ PyObject_CallMethod(va_alist) va_dcl`
`1086`	`1086`	`args=a;`
`1087`	`1087`	`}`
`1088`	`1088`
`1089`		`- retval = PyObject_CallObject(PyCFunction,args);`
	`1089`	`+ retval = PyObject_CallObject(func,args);`
`1090`	`1090`	`Py_DECREF(args);`
`1091`		`- Py_DECREF(PyCFunction);`
	`1091`	`+ Py_DECREF(func);`
`1092`	`1092`	`return retval;`
`1093`	`1093`	`}`
`1094`	`1094`