bpo-44991: Normalise sqlite3 callback suffixes

Erlend E. Aasland · Erlend E. Aasland · commit 5b9238c78f14 · 2021-08-31T14:55:50.000+02:00
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -952,7 +952,8 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co
     return rc;
 }
 
-static int _progress_handler(void* user_arg)
+static int
+progress_callback(void *user_arg)
 {
     PyGILState_STATE gilstate = PyGILState_Ensure();
 
@@ -1089,7 +1090,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,
         sqlite3_progress_handler(self->db, 0, 0, (void*)0);
         Py_XSETREF(self->function_pinboard_progress_handler, NULL);
     } else {
-        sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);
+        sqlite3_progress_handler(self->db, n, progress_callback, progress_handler);
         Py_INCREF(progress_handler);
         Py_XSETREF(self->function_pinboard_progress_handler, progress_handler);
     }

Original file line number	Diff line number	Diff line change
`@@ -952,7 +952,8 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co`
`952`	`952`	`return rc;`
`953`	`953`	`}`
`954`	`954`
`955`		`-static int _progress_handler(void* user_arg)`
	`955`	`+static int`
	`956`	`+progress_callback(void *user_arg)`
`956`	`957`	`{`
`957`	`958`	`PyGILState_STATE gilstate = PyGILState_Ensure();`
`958`	`959`
`@@ -1089,7 +1090,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,`
`1089`	`1090`	`sqlite3_progress_handler(self->db, 0, 0, (void*)0);`
`1090`	`1091`	`Py_XSETREF(self->function_pinboard_progress_handler, NULL);`
`1091`	`1092`	`} else {`
`1092`		`- sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);`
	`1093`	`+ sqlite3_progress_handler(self->db, n, progress_callback, progress_handler);`
`1093`	`1094`	`Py_INCREF(progress_handler);`
`1094`	`1095`	`Py_XSETREF(self->function_pinboard_progress_handler, progress_handler);`
`1095`	`1096`	`}`