bpo-39824: Convert PyModule_GetState() to get_module_state() (pythonGH-19076)

shihai1991 · web-flow · commit 13397ee47d23 · 2020-03-19T10:11:33.000-07:00
Automerge-Triggered-By: @vstinner
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -775,25 +775,25 @@ static struct PyModuleDef_Slot _locale_slots[] = {
 };
 
 static int
-locale_traverse(PyObject *m, visitproc visit, void *arg)
+locale_traverse(PyObject *module, visitproc visit, void *arg)
 {
-    _locale_state *state = (_locale_state*)PyModule_GetState(m);
+    _locale_state *state = get_locale_state(module);
     Py_VISIT(state->Error);
     return 0;
 }
 
 static int
-locale_clear(PyObject *m)
+locale_clear(PyObject *module)
 {
-    _locale_state *state = (_locale_state*)PyModule_GetState(m);
+    _locale_state *state = get_locale_state(module);
     Py_CLEAR(state->Error);
     return 0;
 }
 
 static void
-locale_free(PyObject *m)
+locale_free(PyObject *module)
 {
-    locale_clear(m);
+    locale_clear(module);
 }
 
 static struct PyModuleDef _localemodule = {
diff --git a/Modules/audioop.c b/Modules/audioop.c
@@ -1925,15 +1925,15 @@ static PyMethodDef audioop_methods[] = {
 static int
 audioop_traverse(PyObject *module, visitproc visit, void *arg)
 {
-    audioop_state *state = (audioop_state *)PyModule_GetState(module);
+    audioop_state *state = get_audioop_state(module);
     Py_VISIT(state->AudioopError);
     return 0;
 }
 
 static int
 audioop_clear(PyObject *module)
 {
-    audioop_state *state = (audioop_state *)PyModule_GetState(module);
+    audioop_state *state = get_audioop_state(module);
     Py_CLEAR(state->AudioopError);
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -775,25 +775,25 @@ static struct PyModuleDef_Slot _locale_slots[] = {`
`775`	`775`	`};`
`776`	`776`
`777`	`777`	`static int`
`778`		`-locale_traverse(PyObject m, visitproc visit, void arg)`
	`778`	`+locale_traverse(PyObject module, visitproc visit, void arg)`
`779`	`779`	`{`
`780`		`- _locale_state state = (_locale_state)PyModule_GetState(m);`
	`780`	`+ _locale_state *state = get_locale_state(module);`
`781`	`781`	`Py_VISIT(state->Error);`
`782`	`782`	`return 0;`
`783`	`783`	`}`
`784`	`784`
`785`	`785`	`static int`
`786`		`-locale_clear(PyObject *m)`
	`786`	`+locale_clear(PyObject *module)`
`787`	`787`	`{`
`788`		`- _locale_state state = (_locale_state)PyModule_GetState(m);`
	`788`	`+ _locale_state *state = get_locale_state(module);`
`789`	`789`	`Py_CLEAR(state->Error);`
`790`	`790`	`return 0;`
`791`	`791`	`}`
`792`	`792`
`793`	`793`	`static void`
`794`		`-locale_free(PyObject *m)`
	`794`	`+locale_free(PyObject *module)`
`795`	`795`	`{`
`796`		`- locale_clear(m);`
	`796`	`+ locale_clear(module);`
`797`	`797`	`}`
`798`	`798`
`799`	`799`	`static struct PyModuleDef _localemodule = {`
Original file line number	Diff line number	Diff line change
`@@ -1925,15 +1925,15 @@ static PyMethodDef audioop_methods[] = {`
`1925`	`1925`	`static int`
`1926`	`1926`	`audioop_traverse(PyObject module, visitproc visit, void arg)`
`1927`	`1927`	`{`
`1928`		`- audioop_state state = (audioop_state )PyModule_GetState(module);`
	`1928`	`+ audioop_state *state = get_audioop_state(module);`
`1929`	`1929`	`Py_VISIT(state->AudioopError);`
`1930`	`1930`	`return 0;`
`1931`	`1931`	`}`
`1932`	`1932`
`1933`	`1933`	`static int`
`1934`	`1934`	`audioop_clear(PyObject *module)`
`1935`	`1935`	`{`
`1936`		`- audioop_state state = (audioop_state )PyModule_GetState(module);`
	`1936`	`+ audioop_state *state = get_audioop_state(module);`
`1937`	`1937`	`Py_CLEAR(state->AudioopError);`
`1938`	`1938`	`return 0;`
`1939`	`1939`	`}`