Revert unnecessary name changes

Author: markshannon

Include/internal/pycore_ceval.h

@@ -267,8 +267,6 @@ PyAPI_FUNC(PyObject *)_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, Py
 PyAPI_FUNC(void) _PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *instr);
 PyAPI_FUNC(int) _PyEval_UnpackIterableStackRef(PyThreadState *tstate, _PyStackRef v, int argcnt, int argcntafter, _PyStackRef *sp);
 PyAPI_FUNC(void) _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);
-PyAPI_FUNC(void) _PyEval_ClearThreadFrame(PyThreadState *tstate, _PyInterpreterFrame *frame);
-PyAPI_FUNC(void) _PyEval_ClearGenFrame(PyThreadState *tstate, _PyInterpreterFrame *frame);
 PyAPI_FUNC(PyObject **) _PyObjectArray_FromStackRefArray(_PyStackRef *input, Py_ssize_t nargs, PyObject **scratch);
 
 PyAPI_FUNC(void) _PyObjectArray_Free(PyObject **array, PyObject **scratch);

Python/ceval.c

@@ -1707,7 +1707,7 @@ initialize_locals(PyThreadState *tstate, PyFunctionObject *func,
 }
 
 void
-_PyEval_ClearThreadFrame(PyThreadState *tstate, _PyInterpreterFrame * frame)
+clear_thread_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
     assert(frame->owner == FRAME_OWNED_BY_THREAD);
     // Make sure that this is, indeed, the top frame. We can't check this in
@@ -1723,7 +1723,7 @@ _PyEval_ClearThreadFrame(PyThreadState *tstate, _PyInterpreterFrame * frame)
 }
 
 void
-_PyEval_ClearGenFrame(PyThreadState *tstate, _PyInterpreterFrame * frame)
+clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
     assert(frame->owner == FRAME_OWNED_BY_GENERATOR);
     PyGenObject *gen = _PyGen_GetGeneratorFromFrame(frame);
@@ -1743,10 +1743,10 @@ void
 _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
     if (frame->owner == FRAME_OWNED_BY_THREAD) {
-        _PyEval_ClearThreadFrame(tstate, frame);
+        clear_thread_frame(tstate, frame);
     }
     else {
-        _PyEval_ClearGenFrame(tstate, frame);
+        clear_gen_frame(tstate, frame);
     }
 }
 
@@ -1766,7 +1766,7 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, _PyStackRef func,
     _PyFrame_Initialize(frame, func, locals, code, 0, previous);
     if (initialize_locals(tstate, func_obj, frame->localsplus, args, argcount, kwnames)) {
         assert(frame->owner == FRAME_OWNED_BY_THREAD);
-        _PyEval_ClearThreadFrame(tstate, frame);
+        clear_thread_frame(tstate, frame);
         return NULL;
     }
     return frame;