Skip to content

bpo-44047: Remove unused statement argument to _pysqlite_seterror#25915

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
berkerpeksag merged 1 commit into from
May 7, 2021
Merged

bpo-44047: Remove unused statement argument to _pysqlite_seterror #25915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}

Expand DownExpand Up@@ -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;
Expand DownExpand Up@@ -383,21 +383,21 @@ 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
rc = sqlite3_finalize(statement);
Py_END_ALLOW_THREADS

if (rc != SQLITE_OK && !PyErr_Occurred()) {
_pysqlite_seterror(self->db, NULL);
_pysqlite_seterror(self->db);
}

error:
Expand DownExpand Up@@ -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);
}

}
Expand DownExpand Up@@ -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);
}

}
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -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;
}

Expand DownExpand Up@@ -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;
}

Expand DownExpand Up@@ -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;
}

Expand Down
10 changes: 5 additions & 5 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}

Expand DownExpand Up@@ -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;
}

Expand All@@ -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;
}

Expand DownExpand Up@@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion Modules/_sqlite/util.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion Modules/_sqlite/util.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);

Expand Down