diff options
| author | Gerhard Häring <gh@ghaering.de> | 2008-09-12 18:58:57 (GMT) |
|---|---|---|
| committer | Gerhard Häring <gh@ghaering.de> | 2008-09-12 18:58:57 (GMT) |
| commit | 6e1afcf9883f13bdf8808dc528e381f5c90a131b (patch) | |
| tree | a40283fbad084a0d1cb378ce349a0e707fef1b17 /Modules/_sqlite/connection.c | |
| parent | ef2276b60d2345af49c8268f3a23feb59f5ecc38 (diff) | |
| download | cpython-6e1afcf9883f13bdf8808dc528e381f5c90a131b.zip cpython-6e1afcf9883f13bdf8808dc528e381f5c90a131b.tar.gz cpython-6e1afcf9883f13bdf8808dc528e381f5c90a131b.tar.bz2 | |
Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python.
Diffstat (limited to 'Modules/_sqlite/connection.c')
| -rw-r--r-- | Modules/_sqlite/connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index f98fbd6..9d6952e 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -38,7 +38,7 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level); -void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len) +static void _sqlite3_result_error(sqlite3_context* ctx, const char* errmsg, int len) { /* in older SQLite versions, calling sqlite3_result_error in callbacks * triggers a bug in SQLite that leads either to irritating results or @@ -363,7 +363,7 @@ PyObject* _pysqlite_connection_begin(pysqlite_Connection* self) goto error; } - rc = _sqlite_step_with_busyhandler(statement, self); + rc = pysqlite_step(statement, self); if (rc == SQLITE_DONE) { self->inTransaction = 1; } else { @@ -406,7 +406,7 @@ PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args) goto error; } - rc = _sqlite_step_with_busyhandler(statement, self); + rc = pysqlite_step(statement, self); if (rc == SQLITE_DONE) { self->inTransaction = 0; } else { @@ -452,7 +452,7 @@ PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args goto error; } - rc = _sqlite_step_with_busyhandler(statement, self); + rc = pysqlite_step(statement, self); if (rc == SQLITE_DONE) { self->inTransaction = 0; } else { |