Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-44991: Normalise function and collation callback naming (GH-28209)

This commit is contained in:
Erlend Egeberg Aasland 2021-10-12 13:38:49 +02:00 committed by GitHub
parent b37dc9b3bc
commit cfb1df3b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/_sqlite/connection.c
View File

@ -667,7 +667,7 @@ set_sqlite_error(sqlite3_context *context, const char *msg)
}
static void
_pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
{
PyGILState_STATE threadstate = PyGILState_Ensure();
@ -908,7 +908,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,
return NULL;
}
rc = sqlite3_create_function_v2(self->db, name, narg, flags, ctx,
_pysqlite_func_callback,
func_callback,
NULL,
NULL,
&destructor_callback); // will decref func
@ -1501,10 +1501,8 @@ error:
/* ------------------------- COLLATION CODE ------------------------ */
static int
pysqlite_collation_callback(
void* context,
int text1_length, const void* text1_data,
int text2_length, const void* text2_data)
collation_callback(void *context, int text1_length, const void *text1_data,
int text2_length, const void *text2_data)
{
PyGILState_STATE gilstate = PyGILState_Ensure();
@ -1778,7 +1776,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
return NULL;
}
rc = sqlite3_create_collation_v2(self->db, name, flags, ctx,
&pysqlite_collation_callback,
&collation_callback,
&destructor_callback);
}