psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix up pq_complete_error() calls.

Browse Source
This commit is contained in:
James Henstridge 2008-05-05 15:00:34 +08:00
parent 5beef38bfc
commit 82557e65a2
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
psycopg/lobject_int.c
View File

@ -19,6 +19,7 @@
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include <string.h> #include <string.h>
@ -146,6 +147,7 @@ lobject_close_locked(lobjectObject *self, char **error)
int int
lobject_close(lobjectObject *self) lobject_close(lobjectObject *self)
{ {
PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
int retvalue; int retvalue;
@ -158,7 +160,7 @@ lobject_close(lobjectObject *self)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (retvalue < 0) if (retvalue < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return retvalue; return retvalue;
} }
@ -202,6 +204,7 @@ Py_ssize_t
lobject_write(lobjectObject *self, char *buf, size_t len) lobject_write(lobjectObject *self, char *buf, size_t len)
{ {
Py_ssize_t written; Py_ssize_t written;
PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
@ -215,7 +218,7 @@ lobject_write(lobjectObject *self, char *buf, size_t len)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (written < 0) if (written < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return written; return written;
} }
@ -225,6 +228,7 @@ Py_ssize_t
lobject_read(lobjectObject *self, char *buf, size_t len) lobject_read(lobjectObject *self, char *buf, size_t len)
{ {
Py_ssize_t n_read; Py_ssize_t n_read;
PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
@ -238,7 +242,7 @@ lobject_read(lobjectObject *self, char *buf, size_t len)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (n_read < 0) if (n_read < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return n_read; return n_read;
} }
@ -247,8 +251,9 @@ lobject_read(lobjectObject *self, char *buf, size_t len)
int int
lobject_seek(lobjectObject *self, int pos, int whence) lobject_seek(lobjectObject *self, int pos, int whence)
{ {
int where; PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
int where;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
pthread_mutex_lock(&(self->conn->lock)); pthread_mutex_lock(&(self->conn->lock));
@ -261,7 +266,7 @@ lobject_seek(lobjectObject *self, int pos, int whence)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (where < 0) if (where < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return where; return where;
} }
@ -270,8 +275,9 @@ lobject_seek(lobjectObject *self, int pos, int whence)
int int
lobject_tell(lobjectObject *self) lobject_tell(lobjectObject *self)
{ {
int where; PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
int where;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
pthread_mutex_lock(&(self->conn->lock)); pthread_mutex_lock(&(self->conn->lock));
@ -284,7 +290,7 @@ lobject_tell(lobjectObject *self)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (where < 0) if (where < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return where; return where;
} }
@ -293,8 +299,9 @@ lobject_tell(lobjectObject *self)
int int
lobject_export(lobjectObject *self, char *filename) lobject_export(lobjectObject *self, char *filename)
{ {
int res; PGresult *pgres = NULL;
char *error = NULL; char *error = NULL;
int res;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
pthread_mutex_lock(&(self->conn->lock)); pthread_mutex_lock(&(self->conn->lock));
@ -307,7 +314,7 @@ lobject_export(lobjectObject *self, char *filename)
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (res < 0) if (res < 0)
pq_complete_error(self->conn, NULL, &error); pq_complete_error(self->conn, &pgres, &error);
return res; return res;
} }