From: Richard Hansen <rhansen@rhansen.org>
Date: Sat, 12 Oct 2024 19:33:00 +0000 (-0400)
Subject: gh-124872: Move PyThreadState to first argument for consistency (#124774)
X-Git-Tag: v3.14.0a1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62d5a53a0b2a5262a86984cfe9817aeb653ebfca;p=thirdparty%2FPython%2Fcpython.git

gh-124872: Move PyThreadState to first argument for consistency (#124774)
---

diff --git a/Python/context.c b/Python/context.c
index 36e2677c398f..9b742136b072 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -112,7 +112,8 @@ context_event_name(PyContextEvent event) {
     Py_UNREACHABLE();
 }
 
-static void notify_context_watchers(PyContextEvent event, PyContext *ctx, PyThreadState *ts)
+static void
+notify_context_watchers(PyThreadState *ts, PyContextEvent event, PyContext *ctx)
 {
     assert(Py_REFCNT(ctx) > 0);
     PyInterpreterState *interp = ts->interp;
@@ -192,7 +193,7 @@ _PyContext_Enter(PyThreadState *ts, PyObject *octx)
     ts->context = Py_NewRef(ctx);
     ts->context_ver++;
 
-    notify_context_watchers(Py_CONTEXT_EVENT_ENTER, ctx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_ENTER, ctx);
     return 0;
 }
 
@@ -226,7 +227,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
         return -1;
     }
 
-    notify_context_watchers(Py_CONTEXT_EVENT_EXIT, ctx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_EXIT, ctx);
     Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);
     ts->context_ver++;