Skip to content

bpo-43269: Clean up sqlite3 file scope #24578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 21, 2021
Merged

bpo-43269: Clean up sqlite3 file scope #24578

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81edfda
Fix scope and normalise argument spec
Jan 11, 2021
23b108f
Add Py_UNUSED
Feb 19, 2021
bd5c345
Address review: Remove 'extern' keyword
Feb 20, 2021
5a159fb
Address review: revert OoS style changes
Feb 20, 2021
1c63733
Revert _pysqlite_step_callback
Feb 20, 2021
8487b88
Really revert _authorizer_callback
Feb 20, 2021
e97517f
Revert pysqlite_connection_set_isolation_level
Feb 20, 2021
03ca40a
Restore pysqlite_cursor_setup_types
Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions Modules/_sqlite/cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include <limits.h>

/* only used internally */
pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data)
static pysqlite_Node *
pysqlite_new_node(PyObject *key, PyObject *data)
{
pysqlite_Node* node;

Expand All @@ -43,7 +44,8 @@ pysqlite_Node* pysqlite_new_node(PyObject* key, PyObject* data)
return node;
}

void pysqlite_node_dealloc(pysqlite_Node* self)
static void
pysqlite_node_dealloc(pysqlite_Node *self)
{
PyTypeObject *tp = Py_TYPE(self);

Expand All @@ -54,7 +56,8 @@ void pysqlite_node_dealloc(pysqlite_Node* self)
Py_DECREF(tp);
}

int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs)
static int
pysqlite_cache_init(pysqlite_Cache *self, PyObject *args, PyObject *kwargs)
{
PyObject* factory;
int size = 10;
Expand Down Expand Up @@ -85,7 +88,8 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs)
return 0;
}

void pysqlite_cache_dealloc(pysqlite_Cache* self)
static void
pysqlite_cache_dealloc(pysqlite_Cache *self)
{
PyTypeObject *tp = Py_TYPE(self);
pysqlite_Node* node;
Expand Down Expand Up @@ -113,7 +117,8 @@ void pysqlite_cache_dealloc(pysqlite_Cache* self)
Py_DECREF(tp);
}

PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* key)
extern PyObject *
pysqlite_cache_get(pysqlite_Cache *self, PyObject *key)
{
pysqlite_Node* node;
pysqlite_Node* ptr;
Expand Down Expand Up @@ -217,7 +222,8 @@ PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* key)
return Py_NewRef(node->data);
}

PyObject* pysqlite_cache_display(pysqlite_Cache* self, PyObject* args)
static PyObject *
pysqlite_cache_display(pysqlite_Cache *self, PyObject *args)
{
pysqlite_Node* ptr;
PyObject* prevkey;
Expand Down Expand Up @@ -291,7 +297,8 @@ static PyType_Spec cache_spec = {
};
PyTypeObject *pysqlite_CacheType = NULL;

extern int pysqlite_cache_setup_types(PyObject *mod)
extern int
pysqlite_cache_setup_types(PyObject *mod)
{
pysqlite_NodeType = (PyTypeObject *)PyType_FromModuleAndSpec(mod, &node_spec, NULL);
if (pysqlite_NodeType == NULL) {
Expand Down
92 changes: 63 additions & 29 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ static const char * const begin_statements[] = {
static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level, void *Py_UNUSED(ignored));
static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self);


int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
static int
pysqlite_connection_init(pysqlite_Connection *self, PyObject *args,
PyObject *kwargs)
{
static char *kwlist[] = {
"database", "timeout", "detect_types", "isolation_level",
Expand Down Expand Up @@ -193,7 +194,9 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
}

/* action in (ACTION_RESET, ACTION_FINALIZE) */
void pysqlite_do_all_statements(pysqlite_Connection* self, int action, int reset_cursors)
static void
pysqlite_do_all_statements(pysqlite_Connection *self, int action,
int reset_cursors)
{
int i;
PyObject* weakref;
Expand Down Expand Up @@ -225,7 +228,8 @@ void pysqlite_do_all_statements(pysqlite_Connection* self, int action, int reset
}
}

void pysqlite_connection_dealloc(pysqlite_Connection* self)
static void
pysqlite_connection_dealloc(pysqlite_Connection *self)
{
PyTypeObject *tp = Py_TYPE(self);

Expand Down Expand Up @@ -255,7 +259,9 @@ void pysqlite_connection_dealloc(pysqlite_Connection* self)
*
* 0 => error; 1 => ok
*/
int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObject* cursor)
extern int
pysqlite_connection_register_cursor(pysqlite_Connection *connection,
PyObject *cursor)
{
PyObject* weakref;

Expand Down Expand Up @@ -356,7 +362,8 @@ pysqlite_connection_close_impl(pysqlite_Connection *self)
*
* 0 => error; 1 => ok
*/
int pysqlite_check_connection(pysqlite_Connection* con)
extern int
pysqlite_check_connection(pysqlite_Connection *con)
{
if (!con->initialized) {
PyErr_SetString(pysqlite_ProgrammingError, "Base Connection.__init__ not called.");
Expand All @@ -371,7 +378,8 @@ int pysqlite_check_connection(pysqlite_Connection* con)
}
}

PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
extern PyObject *
_pysqlite_connection_begin(pysqlite_Connection *self)
{
int rc;
const char* tail;
Expand Down Expand Up @@ -509,7 +517,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
}

static int
_pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
_pysqlite_set_result(sqlite3_context *context, PyObject *py_val)
{
if (py_val == Py_None) {
sqlite3_result_null(context);
Expand Down Expand Up @@ -546,7 +554,9 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
return 0;
}

PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_value** argv)
static PyObject *
_pysqlite_build_py_params(sqlite3_context *context, int argc,
sqlite3_value **argv)
{
PyObject* args;
int i;
Expand Down Expand Up @@ -601,7 +611,8 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
}

static void
_pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
_pysqlite_func_callback(sqlite3_context *context, int argc,
sqlite3_value **argv)
{
PyObject* args;
PyObject* py_func;
Expand Down Expand Up @@ -637,7 +648,9 @@ _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv
PyGILState_Release(threadstate);
}

static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_value** params)
static void
_pysqlite_step_callback(sqlite3_context *context, int argc,
sqlite3_value **params)
{
PyObject* args;
PyObject* function_result = NULL;
Expand Down Expand Up @@ -751,7 +764,8 @@ _pysqlite_final_callback(sqlite3_context *context)
PyGILState_Release(threadstate);
}

static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
static void
_pysqlite_drop_unused_statement_references(pysqlite_Connection *self)
{
PyObject* new_list;
PyObject* weakref;
Expand Down Expand Up @@ -782,7 +796,8 @@ static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self
Py_SETREF(self->statements, new_list);
}

static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
static void
_pysqlite_drop_unused_cursor_references(pysqlite_Connection *self)
{
PyObject* new_list;
PyObject* weakref;
Expand Down Expand Up @@ -813,7 +828,8 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
Py_SETREF(self->cursors, new_list);
}

static void _destructor(void* args)
static void
_destructor(void *args)
{
Py_DECREF((PyObject*)args);
}
Expand Down Expand Up @@ -914,7 +930,10 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
Py_RETURN_NONE;
}

static int _authorizer_callback(void* user_arg, int action, const char* arg1, const char* arg2 , const char* dbname, const char* access_attempt_source)
static int
_authorizer_callback(void *user_arg, int action, const char *arg1,
const char *arg2, const char *dbname,
const char *access_attempt_source)
{
PyObject *ret;
int rc;
Expand Down Expand Up @@ -953,7 +972,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_handler(void *user_arg)
{
int rc;
PyObject *ret;
Expand Down Expand Up @@ -987,9 +1007,12 @@ static int _progress_handler(void* user_arg)
* may change in future releases. Callback implementations should return zero
* to ensure future compatibility.
*/
static int _trace_callback(unsigned int type, void* user_arg, void* prepared_statement, void* statement_string)
static int
_trace_callback(unsigned int type, void *user_arg, void *prepared_statement,
void *statement_string)
#else
static void _trace_callback(void* user_arg, const char* statement_string)
static void
_trace_callback(void *user_arg, const char *statement_string)
#endif
{
PyObject *py_statement = NULL;
Expand Down Expand Up @@ -1197,7 +1220,8 @@ pysqlite_connection_load_extension_impl(pysqlite_Connection *self,
}
#endif

int pysqlite_check_thread(pysqlite_Connection* self)
extern int
pysqlite_check_thread(pysqlite_Connection *self)
{
if (self->check_same_thread) {
if (PyThread_get_thread_ident() != self->thread_ident) {
Expand All @@ -1212,12 +1236,16 @@ int pysqlite_check_thread(pysqlite_Connection* self)
return 1;
}

static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused)
static PyObject *
pysqlite_connection_get_isolation_level(pysqlite_Connection *self,
void *Py_UNUSED(unused))
{
return Py_NewRef(self->isolation_level);
}

static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self, void* unused)
static PyObject *
pysqlite_connection_get_total_changes(pysqlite_Connection *self,
void *Py_UNUSED(unused))
{
if (!pysqlite_check_connection(self)) {
return NULL;
Expand All @@ -1226,7 +1254,9 @@ static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self
}
}

static PyObject* pysqlite_connection_get_in_transaction(pysqlite_Connection* self, void* unused)
static PyObject *
pysqlite_connection_get_in_transaction(pysqlite_Connection *self,
void *Py_UNUSED(unused))
{
if (!pysqlite_check_connection(self)) {
return NULL;
Expand All @@ -1238,7 +1268,9 @@ static PyObject* pysqlite_connection_get_in_transaction(pysqlite_Connection* sel
}

static int
pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level, void *Py_UNUSED(ignored))
pysqlite_connection_set_isolation_level(pysqlite_Connection *self,
PyObject *isolation_level,
void *Py_UNUSED(ignored))
{
if (isolation_level == NULL) {
PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
Expand Down Expand Up @@ -1288,7 +1320,9 @@ pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* iso
return 0;
}

PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
static PyObject *
pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
PyObject *kwargs)
{
PyObject* sql;
pysqlite_Statement* statement;
Expand Down Expand Up @@ -1457,10 +1491,9 @@ pysqlite_connection_executescript(pysqlite_Connection *self,
/* ------------------------- COLLATION CODE ------------------------ */

static int
pysqlite_collation_callback(
void* context,
int text1_length, const void* text1_data,
int text2_length, const void* text2_data)
pysqlite_collation_callback(void *context, int text1_length,
const void *text1_data, int text2_length,
const void *text2_data)
{
PyObject* callback = (PyObject*)context;
PyObject* string1 = 0;
Expand Down Expand Up @@ -1919,7 +1952,8 @@ static PyType_Spec connection_spec = {

PyTypeObject *pysqlite_ConnectionType = NULL;

extern int pysqlite_connection_setup_types(PyObject *module)
extern int
pysqlite_connection_setup_types(PyObject *module)
{
pysqlite_ConnectionType = (PyTypeObject *)PyType_FromModuleAndSpec(module, &connection_spec, NULL);
if (pysqlite_ConnectionType == NULL) {
Expand Down
Loading