Skip to content

bpo-44315: Remove unused connection argument from pysqlite_step() #26535

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
pablogsal merged 1 commit into from
Jun 4, 2021
+8 −7
Merged

bpo-44315: Remove unused connection argument from pysqlite_step() #26535

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
4 changes: 2 additions & 2 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self)
goto error;
}

rc = pysqlite_step(statement, self);
rc = pysqlite_step(statement);
if (rc != SQLITE_DONE) {
_pysqlite_seterror(self->db);
}
Expand Down Expand Up @@ -482,7 +482,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
goto error;
}

rc = pysqlite_step(statement, self);
rc = pysqlite_step(statement);
if (rc != SQLITE_DONE) {
_pysqlite_seterror(self->db);
}
Expand Down
6 changes: 3 additions & 3 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
goto error;
}

rc = pysqlite_step(self->statement->st, self->connection);
rc = pysqlite_step(self->statement->st);
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
if (PyErr_Occurred()) {
/* there was an error that occurred in a user-defined callback */
Expand Down Expand Up @@ -773,7 +773,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)

/* execute statement, and ignore results of SELECT statements */
do {
rc = pysqlite_step(statement, self->connection);
rc = pysqlite_step(statement);
if (PyErr_Occurred()) {
(void)sqlite3_finalize(statement);
goto error;
Expand Down Expand Up @@ -847,7 +847,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
}

if (self->statement) {
rc = pysqlite_step(self->statement->st, self->connection);
rc = pysqlite_step(self->statement->st);
if (PyErr_Occurred()) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
Expand Down
3 changes: 2 additions & 1 deletion Modules/_sqlite/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
#include "module.h"
#include "connection.h"

int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection)
int
pysqlite_step(sqlite3_stmt *statement)
{
int rc;

Expand Down
2 changes: 1 addition & 1 deletion Modules/_sqlite/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "sqlite3.h"
#include "connection.h"

int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection);
int pysqlite_step(sqlite3_stmt *statement);

/**
* Checks the SQLite error code and sets the appropriate DB-API exception.
Expand Down