From de1b816f8399f6148498899ffbfe076296232e7c Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Tue, 22 Jan 2019 17:10:15 +0000 Subject: [PATCH] Cleanup of gcc fake positives in lobject --- psycopg/lobject_int.c | 2 +- psycopg/lobject_type.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/psycopg/lobject_int.c b/psycopg/lobject_int.c index b39a7b40..dc4b6722 100644 --- a/psycopg/lobject_int.c +++ b/psycopg/lobject_int.c @@ -236,7 +236,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, /* lobject_close - close an existing lo */ -RAISES_NEG static int +static int lobject_close_locked(lobjectObject *self, char **error) { int retvalue; diff --git a/psycopg/lobject_type.c b/psycopg/lobject_type.c index 7c27a7dc..b4a961b3 100644 --- a/psycopg/lobject_type.c +++ b/psycopg/lobject_type.c @@ -96,6 +96,7 @@ psyco_lobj_write(lobjectObject *self, PyObject *args) } if (-1 == Bytes_AsStringAndSize(data, &buffer, &len)) { + FAKE_RAISE(); /* issue davidmalcolm/gcc-python-plugin#75 */ goto exit; } @@ -357,7 +358,7 @@ lobject_setup(lobjectObject *self, connectionObject *conn, } Py_INCREF((PyObject*)conn); - self->conn = conn; + self->conn = (connectionObject *)TO_STATE((PyObject *)conn); self->mark = conn->mark; self->fd = -1;