diff options
Diffstat (limited to 'src/pl/plpython')
| -rw-r--r-- | src/pl/plpython/plpy_elog.c | 4 | ||||
| -rw-r--r-- | src/pl/plpython/plpy_util.c | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c index 70450d7d9e5..44d35a747b2 100644 --- a/src/pl/plpython/plpy_elog.c +++ b/src/pl/plpython/plpy_elog.c @@ -342,8 +342,8 @@ PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth) static void PLy_get_spi_sqlerrcode(PyObject *exc, int *sqlerrcode) { - PyObject *sqlstate; - char *buffer; + PyObject *sqlstate; + char *buffer; sqlstate = PyObject_GetAttrString(exc, "sqlstate"); if (sqlstate == NULL) diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c index 9a921d92906..95cbba5cdc5 100644 --- a/src/pl/plpython/plpy_util.c +++ b/src/pl/plpython/plpy_util.c @@ -61,8 +61,10 @@ PLy_free(void *ptr) PyObject * PLyUnicode_Bytes(PyObject *unicode) { - PyObject *bytes, *rv; - char *utf8string, *encoded; + PyObject *bytes, + *rv; + char *utf8string, + *encoded; /* First encode the Python unicode object with UTF-8. */ bytes = PyUnicode_AsUTF8String(unicode); @@ -70,7 +72,8 @@ PLyUnicode_Bytes(PyObject *unicode) PLy_elog(ERROR, "could not convert Python Unicode object to bytes"); utf8string = PyBytes_AsString(bytes); - if (utf8string == NULL) { + if (utf8string == NULL) + { Py_DECREF(bytes); PLy_elog(ERROR, "could not extract bytes from encoded string"); } @@ -88,10 +91,10 @@ PLyUnicode_Bytes(PyObject *unicode) PG_TRY(); { encoded = (char *) pg_do_encoding_conversion( - (unsigned char *) utf8string, - strlen(utf8string), - PG_UTF8, - GetDatabaseEncoding()); + (unsigned char *) utf8string, + strlen(utf8string), + PG_UTF8, + GetDatabaseEncoding()); } PG_CATCH(); { |