gh-92206: Improve scoping of sqlite3 statement helper (#92260)

erlend-aasland · web-flow · commit 6b7dcc56072d · 2022-05-03T16:07:11.000-06:00
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -754,6 +754,12 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
     }
 }
 
+static inline void
+stmt_mark_dirty(pysqlite_Statement *self)
+{
+    self->in_use = 1;
+}
+
 PyObject *
 _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)
 {
@@ -844,7 +850,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
     }
 
     stmt_reset(self->statement);
-    pysqlite_statement_mark_dirty(self->statement);
+    stmt_mark_dirty(self->statement);
 
     /* We start a transaction implicitly before a DML statement.
        SELECT is the only exception. See #9924. */
@@ -863,7 +869,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
             break;
         }
 
-        pysqlite_statement_mark_dirty(self->statement);
+        stmt_mark_dirty(self->statement);
 
         bind_parameters(state, self->statement, parameters);
         if (PyErr_Occurred()) {
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
@@ -116,11 +116,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
     return NULL;
 }
 
-void pysqlite_statement_mark_dirty(pysqlite_Statement* self)
-{
-    self->in_use = 1;
-}
-
 static void
 stmt_dealloc(pysqlite_Statement *self)
 {
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -39,8 +39,6 @@ typedef struct
 
 pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
 
-void pysqlite_statement_mark_dirty(pysqlite_Statement* self);
-
 int pysqlite_statement_setup_types(PyObject *module);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -754,6 +754,12 @@ bind_parameters(pysqlite_state state, pysqlite_Statement self,`
`754`	`754`	`}`
`755`	`755`	`}`
`756`	`756`
	`757`	`+static inline void`
	`758`	`+stmt_mark_dirty(pysqlite_Statement *self)`
	`759`	`+{`
	`760`	`+ self->in_use = 1;`
	`761`	`+}`
	`762`	`+`
`757`	`763`	`PyObject *`
`758`	`764`	`_pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)`
`759`	`765`	`{`
`@@ -844,7 +850,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation`
`844`	`850`	`}`
`845`	`851`
`846`	`852`	`stmt_reset(self->statement);`
`847`		`- pysqlite_statement_mark_dirty(self->statement);`
	`853`	`+ stmt_mark_dirty(self->statement);`
`848`	`854`
`849`	`855`	`/* We start a transaction implicitly before a DML statement.`
`850`	`856`	`SELECT is the only exception. See #9924. */`
`@@ -863,7 +869,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation`
`863`	`869`	`break;`
`864`	`870`	`}`
`865`	`871`
`866`		`- pysqlite_statement_mark_dirty(self->statement);`
	`872`	`+ stmt_mark_dirty(self->statement);`
`867`	`873`
`868`	`874`	`bind_parameters(state, self->statement, parameters);`
`869`	`875`	`if (PyErr_Occurred()) {`
Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,6 @@ pysqlite_statement_create(pysqlite_Connection connection, PyObject sql)`
`116`	`116`	`return NULL;`
`117`	`117`	`}`
`118`	`118`
`119`		`- 8000 void pysqlite_statement_mark_dirty(pysqlite_Statement* self)`
`120`		`-{`
`121`		`- self->in_use = 1;`
`122`		`-}`
`123`		`-`
`124`	`119`	`static void`
`125`	`120`	`stmt_dealloc(pysqlite_Statement *self)`
`126`	`121`	`{`