From 0988ed09b4c058fabb58a7ea7e757adafcf8763c Mon Sep 17 00:00:00 2001 From: Erlend Egeberg Aasland Date: Fri, 7 May 2021 15:15:01 +0200 Subject: [PATCH] bpo-44047: Remove unused argument to _pysqlite_seterror (GH-25915) --- Modules/_sqlite/connection.c | 30 +++++++++++++++--------------- Modules/_sqlite/cursor.c | 10 +++++----- Modules/_sqlite/util.c | 3 ++- Modules/_sqlite/util.h | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index fb5411243c6798..28932726b74257 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -115,7 +115,7 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, Py_DECREF(database_obj); if (rc != SQLITE_OK) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); return -1; } @@ -342,7 +342,7 @@ pysqlite_connection_close_impl(pysqlite_Connection *self) rc = sqlite3_close_v2(self->db); if (rc != SQLITE_OK) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); return NULL; } else { self->db = NULL; @@ -383,13 +383,13 @@ PyObject* _pysqlite_connection_begin(pysqlite_Connection* self) Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { - _pysqlite_seterror(self->db, statement); + _pysqlite_seterror(self->db); goto error; } rc = pysqlite_step(statement, self); if (rc != SQLITE_DONE) { - _pysqlite_seterror(self->db, statement); + _pysqlite_seterror(self->db); } Py_BEGIN_ALLOW_THREADS @@ -397,7 +397,7 @@ PyObject* _pysqlite_connection_begin(pysqlite_Connection* self) Py_END_ALLOW_THREADS if (rc != SQLITE_OK && !PyErr_Occurred()) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); } error: @@ -431,20 +431,20 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self) rc = sqlite3_prepare_v2(self->db, "COMMIT", -1, &statement, NULL); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); goto error; } rc = pysqlite_step(statement, self); if (rc != SQLITE_DONE) { - _pysqlite_seterror(self->db, statement); + _pysqlite_seterror(self->db); } Py_BEGIN_ALLOW_THREADS rc = sqlite3_finalize(statement); Py_END_ALLOW_THREADS if (rc != SQLITE_OK && !PyErr_Occurred()) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); } } @@ -481,20 +481,20 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self) rc = sqlite3_prepare_v2(self->db, "ROLLBACK", -1, &statement, NULL); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); goto error; } rc = pysqlite_step(statement, self); if (rc != SQLITE_DONE) { - _pysqlite_seterror(self->db, statement); + _pysqlite_seterror(self->db); } Py_BEGIN_ALLOW_THREADS rc = sqlite3_finalize(statement); Py_END_ALLOW_THREADS if (rc != SQLITE_OK && !PyErr_Occurred()) { - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); } } @@ -1348,7 +1348,7 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args, PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string."); } else { (void)pysqlite_statement_reset(statement); - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); } goto error; } @@ -1669,7 +1669,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self, Py_END_ALLOW_THREADS if (bck_handle == NULL) { - _pysqlite_seterror(bck_conn, NULL); + _pysqlite_seterror(bck_conn); return NULL; } @@ -1707,7 +1707,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self, Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { - _pysqlite_seterror(bck_conn, NULL); + _pysqlite_seterror(bck_conn); return NULL; } @@ -1793,7 +1793,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self, PyErr_Clear(); } } - _pysqlite_seterror(self->db, NULL); + _pysqlite_seterror(self->db); goto finally; } diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 60dfc7dce8fb5e..b71f780a0b4dfd 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -537,7 +537,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation } } (void)pysqlite_statement_reset(self->statement); - _pysqlite_seterror(self->connection->db, NULL); + _pysqlite_seterror(self->connection->db); goto error; } @@ -715,7 +715,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) &script_cstr); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { - _pysqlite_seterror(self->connection->db, NULL); + _pysqlite_seterror(self->connection->db); goto error; } @@ -730,13 +730,13 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) if (rc != SQLITE_DONE) { (void)sqlite3_finalize(statement); - _pysqlite_seterror(self->connection->db, NULL); + _pysqlite_seterror(self->connection->db); goto error; } rc = sqlite3_finalize(statement); if (rc != SQLITE_OK) { - _pysqlite_seterror(self->connection->db, NULL); + _pysqlite_seterror(self->connection->db); goto error; } @@ -802,7 +802,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self) if (rc != SQLITE_DONE && rc != SQLITE_ROW) { (void)pysqlite_statement_reset(self->statement); Py_DECREF(next_row); - _pysqlite_seterror(self->connection->db, NULL); + _pysqlite_seterror(self->connection->db); return NULL; } diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c index 0f4eba0ab31b60..3676935b9e9beb 100644 --- a/Modules/_sqlite/util.c +++ b/Modules/_sqlite/util.c @@ -39,7 +39,8 @@ int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection) * Checks the SQLite error code and sets the appropriate DB-API exception. * Returns the error code (0 means no error occurred). */ -int _pysqlite_seterror(sqlite3* db, sqlite3_stmt* st) +int +_pysqlite_seterror(sqlite3 *db) { int errorcode = sqlite3_errcode(db); diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h index cff31cda9578a0..82e58139d02f9c 100644 --- a/Modules/_sqlite/util.h +++ b/Modules/_sqlite/util.h @@ -35,7 +35,7 @@ int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection); * Checks the SQLite error code and sets the appropriate DB-API exception. * Returns the error code (0 means no error occurred). */ -int _pysqlite_seterror(sqlite3* db, sqlite3_stmt* st); +int _pysqlite_seterror(sqlite3 *db); sqlite_int64 _pysqlite_long_as_int64(PyObject * value);