ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-28 09:28:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #8914: fix various warnings from the Clang static analyzer v254.

Browse source
This commit is contained in:
Brett Cannon 2011-02-22 20:15:44 +00:00
parent 79da6b7075
commit b94767ff44
36 changed files with 69 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Modules/_sqlite/connection.c
View file

@ -673,7 +673,6 @@ void _pysqlite_final_callback(sqlite3_context* context)
{
PyObject* function_result = NULL;
PyObject** aggregate_instance;
PyObject* aggregate_class;
#ifdef WITH_THREAD
PyGILState_STATE threadstate;
@ -681,8 +680,6 @@ void _pysqlite_final_callback(sqlite3_context* context)
threadstate = PyGILState_Ensure();
#endif
aggregate_class = (PyObject*)sqlite3_user_data(context);
aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
if (!*aggregate_instance) {
/* this branch is executed if there was an exception in the aggregate's

8
Modules/_sqlite/cursor.c
View file

@ -126,11 +126,9 @@ static int pysqlite_cursor_init(pysqlite_Cursor* self, PyObject* args, PyObject*
static void pysqlite_cursor_dealloc(pysqlite_Cursor* self)
{
int rc;
/* Reset the statement if the user has not closed the cursor */
if (self->statement) {
rc = pysqlite_statement_reset(self->statement);
pysqlite_statement_reset(self->statement);
Py_DECREF(self->statement);
}
@ -529,7 +527,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
if (self->statement != NULL) {
/* There is an active statement */
rc = pysqlite_statement_reset(self->statement);
pysqlite_statement_reset(self->statement);
}
operation_cstr = _PyUnicode_AsStringAndSize(operation, &operation_len);
@ -734,7 +732,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
}
if (multiple) {
rc = pysqlite_statement_reset(self->statement);
pysqlite_statement_reset(self->statement);
}
Py_XDECREF(parameters);
}

4
Modules/_sqlite/statement.c
View file

@ -369,11 +369,9 @@ void pysqlite_statement_mark_dirty(pysqlite_Statement* self)
void pysqlite_statement_dealloc(pysqlite_Statement* self)
{
int rc;
if (self->st) {
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_finalize(self->st);
sqlite3_finalize(self->st);
Py_END_ALLOW_THREADS
}