From 6ff517627b75989dc6bbda284a82c6ccf52bb09f Mon Sep 17 00:00:00 2001 From: Andy Lester Date: Sun, 8 Mar 2020 23:09:05 -0500 Subject: [PATCH] Modify args in two functions: * Remove unused arg from init_set_builtins_open(PyThreadState *tstate) * Change fd in _Py_FatalError_PrintExc(int fd) to PyThreadState * --- Python/pylifecycle.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index eaae5fdbb6692b..257b926b8d9890 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -65,7 +65,7 @@ extern grammar _PyParser_Grammar; /* From graminit.c */ /* Forward declarations */ static PyStatus add_main_module(PyInterpreterState *interp); static PyStatus init_import_site(void); -static PyStatus init_set_builtins_open(PyThreadState *tstate); +static PyStatus init_set_builtins_open(void); static PyStatus init_sys_streams(PyThreadState *tstate); static PyStatus init_signals(PyThreadState *tstate); static void call_py_exitfuncs(PyThreadState *tstate); @@ -1019,7 +1019,7 @@ init_interp_main(PyThreadState *tstate) return status; } - status = init_set_builtins_open(tstate); + status = init_set_builtins_open(); if (_PyStatus_EXCEPTION(status)) { return status; } @@ -1872,7 +1872,7 @@ create_stdio(const PyConfig *config, PyObject* io, /* Set builtins.open to io.OpenWrapper */ static PyStatus -init_set_builtins_open(PyThreadState *tstate) +init_set_builtins_open(void) { PyObject *iomod = NULL, *wrapper; PyObject *bimod = NULL; @@ -2040,9 +2040,8 @@ _Py_FatalError_DumpTracebacks(int fd, PyInterpreterState *interp, Return 1 if the traceback was displayed, 0 otherwise. */ static int -_Py_FatalError_PrintExc(int fd) +_Py_FatalError_PrintExc(PyThreadState *tstate) { - PyThreadState *tstate = _PyThreadState_GET(); PyObject *ferr, *res; PyObject *exception, *v, *tb; int has_tb; @@ -2204,7 +2203,7 @@ fatal_error(const char *prefix, const char *msg, int status) int has_tstate_and_gil = (tss_tstate != NULL && tss_tstate == tstate); if (has_tstate_and_gil) { /* If an exception is set, print the exception with its traceback */ - if (!_Py_FatalError_PrintExc(fd)) { + if (!_Py_FatalError_PrintExc(tss_tstate)) { /* No exception is set, or an exception is set without traceback */ _Py_FatalError_DumpTracebacks(fd, interp, tss_tstate); }