pgindent run before 6.3 release, with Thomas' requested changes.

1 files changed, 263 insertions, 223 deletions

diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c
index 1dbadb1fc08..44f4856e26f 100644
--- a/src/interfaces/python/pgmodule.c
+++ b/src/interfaces/python/pgmodule.c
@@ -3,27 +3,27 @@
  * D'Arcy J.M. Cain, (darcy@druid.net).  Based heavily on code written by
  * Pascal Andre, andre@chimay.via.ecp.fr. Copyright (c) 1995, Pascal Andre
  * (andre@via.ecp.fr).
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without a written
  * agreement is hereby granted, provided that the above copyright notice and
  * this paragraph and the following two paragraphs appear in all copies or in
  * any new file that contains a substantial portion of this file.
- * 
+ *
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
  * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
  * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE
  * AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
  * AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
  * ENHANCEMENTS, OR MODIFICATIONS.
- * 
+ *
  * Further modifications copyright 1997 by D'Arcy J.M. Cain (darcy@druid.net)
  * subject to the same terms and conditions as above.
- * 
+ *
  */
 
 #include <Python.h>
@@ -36,21 +36,21 @@ static PyObject *PGError;
 /* taken from fileobject.c */
 #define BUF(v) PyString_AS_STRING((PyStringObject *)(v))
 
-#define CHECK_OPEN        1
-#define CHECK_CLOSE       2
+#define CHECK_OPEN		  1
+#define CHECK_CLOSE		  2
 
 #define MAX_BUFFER_SIZE   8192	/* maximum transaction size */
 
 #ifndef NO_DIRECT
-#define DIRECT_ACCESS     1		/* enables direct access functions */
+#define DIRECT_ACCESS	  1		/* enables direct access functions */
 #endif							/* NO_DIRECT */
 
 #ifndef NO_LARGE
-#define LARGE_OBJECTS     1		/* enables large objects support */
+#define LARGE_OBJECTS	  1		/* enables large objects support */
 #endif							/* NO_LARGE */
 
 #ifndef NO_DEF_VAR
-#define DEFAULT_VARS      1		/* enables default variables use */
+#define DEFAULT_VARS	  1		/* enables default variables use */
 #endif							/* NO_DEF_VAR */
 
 /* --------------------------------------------------------------------- */
@@ -59,11 +59,11 @@ static PyObject *PGError;
 
 #ifdef DEFAULT_VARS
 
-PyObject       *pg_default_host;	/* default database host */
-PyObject       *pg_default_base;	/* default database name */
-PyObject       *pg_default_opt;		/* default connection options */
-PyObject       *pg_default_tty;		/* default debug tty */
-PyObject       *pg_default_port;	/* default connection port */
+PyObject   *pg_default_host;	/* default database host */
+PyObject   *pg_default_base;	/* default database name */
+PyObject   *pg_default_opt;		/* default connection options */
+PyObject   *pg_default_tty;		/* default debug tty */
+PyObject   *pg_default_port;	/* default connection port */
 
 #endif							/* DEFAULT_VARS */
 
@@ -76,9 +76,9 @@ PyObject       *pg_default_port;	/* default connection port */
 typedef struct
 {
 	PyObject_HEAD
-	int             valid;			/* validity flag */
-	PGconn         *cnx;			/* PostGres connection handle */
-}               pgobject;
+	int			valid;			/* validity flag */
+	PGconn	   *cnx;			/* PostGres connection handle */
+}			pgobject;
 
 staticforward PyTypeObject PgType;
 
@@ -89,8 +89,8 @@ staticforward PyTypeObject PgType;
 typedef struct
 {
 	PyObject_HEAD
-	PGresult       *last_result;	/* last result content */
-}               pgqueryobject;
+	PGresult   *last_result;	/* last result content */
+}			pgqueryobject;
 
 staticforward PyTypeObject PgQueryType;
 
@@ -103,9 +103,9 @@ typedef struct
 {
 	PyObject_HEAD
 	pgobject * pgcnx;
-	Oid             lo_oid;
-	int             lo_fd;
-}               pglargeobject;
+	Oid			lo_oid;
+	int			lo_fd;
+}			pglargeobject;
 
 staticforward PyTypeObject PglargeType;
 
@@ -158,17 +158,17 @@ check_lo(pglargeobject * self, int level)
 /* pglargeobject initialisation (from pgobject) */
 
 /* creates large object */
-static PyObject  *
+static PyObject *
 pg_locreate(pgobject * self, PyObject * args)
 {
-	int             mode;
-	pglargeobject  *npglo;
+	int			mode;
+	pglargeobject *npglo;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "i", &mode))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"locreate(mode), with mode (integer).");
+						"locreate(mode), with mode (integer).");
 		return NULL;
 	}
 
@@ -195,8 +195,8 @@ pg_locreate(pgobject * self, PyObject * args)
 static PyObject *
 pg_getlo(pgobject * self, PyObject * args)
 {
-	int             lo_oid;
-	pglargeobject  *npglo;
+	int			lo_oid;
+	pglargeobject *npglo;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "i", &lo_oid))
@@ -227,8 +227,8 @@ pg_getlo(pgobject * self, PyObject * args)
 static PyObject *
 pg_loimport(pgobject * self, PyObject * args)
 {
-	char           *name;
-	pglargeobject  *npglo;
+	char	   *name;
+	pglargeobject *npglo;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "s", &name))
@@ -273,7 +273,8 @@ pglarge_dealloc(pglargeobject * self)
 static PyObject *
 pglarge_open(pglargeobject * self, PyObject * args)
 {
-	int             mode, fd;
+	int			mode,
+				fd;
 
 	/* check validity */
 	if (!check_lo(self, CHECK_CLOSE))
@@ -307,7 +308,7 @@ pglarge_close(pglargeobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method close() takes no parameters.");
+						"method close() takes no parameters.");
 		return NULL;
 	}
 
@@ -332,8 +333,8 @@ pglarge_close(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_read(pglargeobject * self, PyObject * args)
 {
-	int             size;
-	PyObject       *buffer;
+	int			size;
+	PyObject   *buffer;
 
 	/* checks validity */
 	if (!check_lo(self, CHECK_OPEN))
@@ -371,8 +372,8 @@ pglarge_read(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_write(pglargeobject * self, PyObject * args)
 {
-	PyObject       *buffer;
-	int             size;
+	PyObject   *buffer;
+	int			size;
 
 	/* checks validity */
 	if (!check_lo(self, CHECK_OPEN))
@@ -382,13 +383,13 @@ pglarge_write(pglargeobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, "s", &buffer))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"write(buffer), with buffer (sized string).");
+						"write(buffer), with buffer (sized string).");
 		return NULL;
 	}
 
 	/* sends query */
 	if ((size = lo_write(self->pgcnx->cnx, self->lo_fd, (char *) BUF(buffer),
-					PyString_Size(buffer))) <  PyString_Size(buffer))
+						 PyString_Size(buffer))) < PyString_Size(buffer))
 	{
 		PyErr_SetString(PyExc_IOError, "buffer truncated during write.");
 		return NULL;
@@ -403,7 +404,9 @@ pglarge_write(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_lseek(pglargeobject * self, PyObject * args)
 {
-	int             ret, offset, whence;
+	int			ret,
+				offset,
+				whence;
 
 	/* checks validity */
 	if (!check_lo(self, CHECK_OPEN))
@@ -413,7 +416,7 @@ pglarge_lseek(pglargeobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, "ii", offset, whence))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"lseek(offset, whence), with offset and whence (integers).");
+			"lseek(offset, whence), with offset and whence (integers).");
 		return NULL;
 	}
 
@@ -432,13 +435,14 @@ pglarge_lseek(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_size(pglargeobject * self, PyObject * args)
 {
-	int             start, end;
+	int			start,
+				end;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method size() takes no parameters.");
+						"method size() takes no parameters.");
 		return NULL;
 	}
 
@@ -461,10 +465,10 @@ pglarge_size(pglargeobject * self, PyObject * args)
 	}
 
 	/* move back to start position */
-	if ((start = lo_lseek(self->pgcnx->cnx,self->lo_fd,start,SEEK_SET)) == -1)
+	if ((start = lo_lseek(self->pgcnx->cnx, self->lo_fd, start, SEEK_SET)) == -1)
 	{
 		PyErr_SetString(PyExc_IOError,
-				"error while moving back to first position.");
+						"error while moving back to first position.");
 		return NULL;
 	}
 
@@ -476,13 +480,13 @@ pglarge_size(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_tell(pglargeobject * self, PyObject * args)
 {
-	int             start;
+	int			start;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method tell() takes no parameters.");
+						"method tell() takes no parameters.");
 		return NULL;
 	}
 
@@ -505,7 +509,7 @@ pglarge_tell(pglargeobject * self, PyObject * args)
 static PyObject *
 pglarge_export(pglargeobject * self, PyObject * args)
 {
-	char           *name;
+	char	   *name;
 
 	/* checks validity */
 	if (!check_lo(self, CHECK_CLOSE))
@@ -515,7 +519,7 @@ pglarge_export(pglargeobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, "s", &name))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"export(filename), with filename (string).");
+						"export(filename), with filename (string).");
 		return NULL;
 	}
 
@@ -538,7 +542,7 @@ pglarge_unlink(pglargeobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method unlink() takes no parameters.");
+						"method unlink() takes no parameters.");
 		return NULL;
 	}
 
@@ -560,16 +564,17 @@ pglarge_unlink(pglargeobject * self, PyObject * args)
 
 /* large object methods */
 static struct PyMethodDef pglarge_methods[] = {
-	{"open",	(PyCFunction) pglarge_open, 1},	/* opens large object */
-	{"close",	(PyCFunction) pglarge_close, 1},/* closes large object */
-	{"read",	(PyCFunction) pglarge_read, 1},	/* reads from large object */
-	{"write",	(PyCFunction) pglarge_write, 1},/* writes to large object */
-	{"seek",	(PyCFunction) pglarge_lseek, 1},/* seeks position */
-	{"size",	(PyCFunction) pglarge_size, 1},	/* gives object size */
-	{"tell",	(PyCFunction) pglarge_tell, 1},	/* gives position in lobj */
-	{"export",	(PyCFunction) pglarge_export, 1},/* exports to unix file */
-	{"unlink",	(PyCFunction) pglarge_unlink, 1},/* deletes a large object */
-	{NULL, NULL}								/* sentinel */
+	{"open", (PyCFunction) pglarge_open, 1},	/* opens large object */
+	{"close", (PyCFunction) pglarge_close, 1},	/* closes large object */
+	{"read", (PyCFunction) pglarge_read, 1},	/* reads from large object */
+	{"write", (PyCFunction) pglarge_write, 1},	/* writes to large object */
+	{"seek", (PyCFunction) pglarge_lseek, 1},	/* seeks position */
+	{"size", (PyCFunction) pglarge_size, 1},	/* gives object size */
+	{"tell", (PyCFunction) pglarge_tell, 1},	/* gives position in lobj */
+	{"export", (PyCFunction) pglarge_export, 1},		/* exports to unix file */
+	{"unlink", (PyCFunction) pglarge_unlink, 1},		/* deletes a large
+														 * object */
+	{NULL, NULL}				/* sentinel */
 };
 
 /* get attribute */
@@ -608,7 +613,7 @@ pglarge_getattr(pglargeobject * self, char *name)
 	/* attributes list */
 	if (!strcmp(name, "__members__"))
 	{
-		PyObject       *list = PyList_New(3);
+		PyObject   *list = PyList_New(3);
 
 		if (list)
 		{
@@ -626,22 +631,22 @@ pglarge_getattr(pglargeobject * self, char *name)
 /* object type definition */
 staticforward PyTypeObject PglargeType = {
 	PyObject_HEAD_INIT(&PyType_Type)
-	0,								/* ob_size */
-	"pglarge",						/* tp_name */
-	sizeof(pglargeobject),			/* tp_basicsize */
-	0,								/* tp_itemsize */
+	0,							/* ob_size */
+	"pglarge",					/* tp_name */
+	sizeof(pglargeobject),		/* tp_basicsize */
+	0,							/* tp_itemsize */
 
 	/* methods */
-	(destructor) pglarge_dealloc,	/* tp_dealloc */
-	0,								/* tp_print */
-	(getattrfunc) pglarge_getattr,	/* tp_getattr */
-	0,								/* tp_setattr */
-	0,								/* tp_compare */
-	0,								/* tp_repr */
-	0,								/* tp_as_number */
-	0,								/* tp_as_sequence */
-	0,								/* tp_as_mapping */
-	0,								/* tp_hash */
+	(destructor) pglarge_dealloc,		/* tp_dealloc */
+	0,							/* tp_print */
+	(getattrfunc) pglarge_getattr,		/* tp_getattr */
+	0,							/* tp_setattr */
+	0,							/* tp_compare */
+	0,							/* tp_repr */
+	0,							/* tp_as_number */
+	0,							/* tp_as_sequence */
+	0,							/* tp_as_mapping */
+	0,							/* tp_hash */
 };
 
 #endif							/* LARGE_OBJECTS */
@@ -655,26 +660,29 @@ staticforward PyTypeObject PglargeType = {
 static PyObject *
 pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 {
-	char           *pghost, *pgopt, *pgtty, *pgdbname;
-	int             pgport;
-	char            port_buffer[20];
-	PyObject       *temp;
-	pgobject       *npgobj;
-	PGconn         *test_cnx;
+	char	   *pghost,
+			   *pgopt,
+			   *pgtty,
+			   *pgdbname;
+	int			pgport;
+	char		port_buffer[20];
+	PyObject   *temp;
+	pgobject   *npgobj;
+	PGconn	   *test_cnx;
 
 	pghost = pgopt = pgtty = pgdbname = NULL;
 	pgport = -1;
 
 	/* parses standard arguments */
 	if (!PyArg_ParseTuple(args, "|zzlzz",
-					&pgdbname, &pghost, &pgport, &pgopt, &pgtty))
+						  &pgdbname, &pghost, &pgport, &pgopt, &pgtty))
 	{
 		PyErr_Clear();
 
 		if (!PyArg_ParseTuple(args, ""))
 		{
 			PyErr_SetString(PyExc_TypeError,
-						"connect(dbname, host, port, opt, tty), "
+							"connect(dbname, host, port, opt, tty), "
 							"with args (opt., strings or None).");
 			return NULL;
 		}
@@ -691,14 +699,14 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 				if (pghost)
 				{
 					PyErr_SetString(PyExc_SyntaxError,
-								"Duplicate argument definition.");
+									"Duplicate argument definition.");
 					return NULL;
 				}
 
 				if (!PyString_Check(temp))
 				{
 					PyErr_SetString(PyExc_TypeError,
-								 "'Host' argument must be a string.");
+									"'Host' argument must be a string.");
 					return NULL;
 				}
 
@@ -714,14 +722,14 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 				if (pgport != -1)
 				{
 					PyErr_SetString(PyExc_SyntaxError,
-								"Duplicate argument definition.");
+									"Duplicate argument definition.");
 					return NULL;
 				}
 
 				if (!PyInt_Check(temp))
 				{
 					PyErr_SetString(PyExc_TypeError,
-								"'Port' argument must be an integer.");
+								  "'Port' argument must be an integer.");
 					return NULL;
 				}
 
@@ -737,14 +745,14 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 				if (pgtty)
 				{
 					PyErr_SetString(PyExc_SyntaxError,
-								"Duplicate argument definition.");
+									"Duplicate argument definition.");
 					return NULL;
 				}
 
 				if (!PyString_Check(temp))
 				{
 					PyErr_SetString(PyExc_TypeError,
-								"'opt' argument must be a string.");
+									"'opt' argument must be a string.");
 					return NULL;
 				}
 
@@ -760,14 +768,14 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 				if (pgtty)
 				{
 					PyErr_SetString(PyExc_SyntaxError,
-							"Duplicate argument definition.");
+									"Duplicate argument definition.");
 					return NULL;
 				}
 
 				if (!PyString_Check(temp))
 				{
 					PyErr_SetString(PyExc_TypeError,
-							"'tty' argument must be a string.");
+									"'tty' argument must be a string.");
 					return NULL;
 				}
 
@@ -783,14 +791,14 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 				if (pgdbname)
 				{
 					PyErr_SetString(PyExc_SyntaxError,
-							"Duplicate argument definition.");
+									"Duplicate argument definition.");
 					return NULL;
 				}
 
 				if (!PyString_Check(temp))
 				{
 					PyErr_SetString(PyExc_TypeError,
-							"'dbname' argument must be a string.");
+								  "'dbname' argument must be a string.");
 					return NULL;
 				}
 
@@ -866,7 +874,7 @@ pg_reset(pgobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method reset() takes no parameters.");
+						"method reset() takes no parameters.");
 		return NULL;
 	}
 
@@ -880,15 +888,17 @@ pg_reset(pgobject * self, PyObject * args)
 static PyObject *
 pg_listfields(pgqueryobject * self, PyObject * args)
 {
-	int             i, n;
-	char           *name;
-	PyObject       *fieldstuple, *str;
+	int			i,
+				n;
+	char	   *name;
+	PyObject   *fieldstuple,
+			   *str;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method listfields() takes no parameters.");
+						"method listfields() takes no parameters.");
 		return NULL;
 	}
 
@@ -910,14 +920,14 @@ pg_listfields(pgqueryobject * self, PyObject * args)
 static PyObject *
 pg_fieldname(pgqueryobject * self, PyObject * args)
 {
-	int             i;
-	char           *name;
+	int			i;
+	char	   *name;
 
 	/* gets args */
 	if (!PyArg_ParseTuple(args, "i", &i))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"fieldname(number), with number(integer).");
+						"fieldname(number), with number(integer).");
 		return NULL;
 	}
 
@@ -937,8 +947,8 @@ pg_fieldname(pgqueryobject * self, PyObject * args)
 static PyObject *
 pg_fieldnum(pgqueryobject * self, PyObject * args)
 {
-	char           *name;
-	int             num;
+	char	   *name;
+	int			num;
 
 	/* gets args */
 	if (!PyArg_ParseTuple(args, "s", &name))
@@ -961,14 +971,19 @@ pg_fieldnum(pgqueryobject * self, PyObject * args)
 static PyObject *
 pg_getresult(pgqueryobject * self, PyObject * args)
 {
-	PyObject       *rowtuple, *reslist, *str;
-	int             i, j, m, n;
+	PyObject   *rowtuple,
+			   *reslist,
+			   *str;
+	int			i,
+				j,
+				m,
+				n;
 
 	/* checks args (args == NULL for an internal call) */
 	if ((args != NULL) && (!PyArg_ParseTuple(args, "")))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method getresult() takes no parameters.");
+						"method getresult() takes no parameters.");
 		return NULL;
 	}
 
@@ -998,20 +1013,25 @@ pg_getresult(pgqueryobject * self, PyObject * args)
 static PyObject *
 pg_getnotify(pgobject * self, PyObject * args)
 {
-	PGnotify       *notify;
-	PGresult       *result;
-	PyObject       *notify_result, *temp;
+	PGnotify   *notify;
+	PGresult   *result;
+	PyObject   *notify_result,
+			   *temp;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method getnotify() takes no parameters.");
+						"method getnotify() takes no parameters.");
 		return NULL;
 	}
 
 	/* gets notify and builds result */
-	/* notifies only come back as result of a query, so I send an empty query */
+
+	/*
+	 * notifies only come back as result of a query, so I send an empty
+	 * query
+	 */
 	result = PQexec(self->cnx, " ");
 
 	if ((notify = PQnotifies(self->cnx)) != NULL)
@@ -1039,11 +1059,17 @@ pg_getnotify(pgobject * self, PyObject * args)
 static PyObject *
 pg_query(pgobject * self, PyObject * args)
 {
-	char           *query;
-	PGresult       *result;
-	PyObject       *rowtuple, *reslist, *str;
-	pgqueryobject  *npgobj;
-	int             i, j, m, n, status;
+	char	   *query;
+	PGresult   *result;
+	PyObject   *rowtuple,
+			   *reslist,
+			   *str;
+	pgqueryobject *npgobj;
+	int			i,
+				j,
+				m,
+				n,
+				status;
 
 	/* get query args */
 	if (!PyArg_ParseTuple(args, "s", &query))
@@ -1074,24 +1100,24 @@ pg_query(pgobject * self, PyObject * args)
 				break;
 			case PGRES_BAD_RESPONSE:
 				PyErr_SetString(PGError,
-						"unexpected responsed received from server.");
+						   "unexpected responsed received from server.");
 				break;
 			case PGRES_FATAL_ERROR:
 				PyErr_SetString(PGError,
-					"server fatal error.  "
-							"Please report to your db administrator.");
+								"server fatal error.  "
+							  "Please report to your db administrator.");
 				break;
 			case PGRES_NONFATAL_ERROR:
 				PyErr_SetString(PGError, "server (non fatal) error.");
 				break;
-			case PGRES_COMMAND_OK:	/* no data will be received */
+			case PGRES_COMMAND_OK:		/* no data will be received */
 			case PGRES_COPY_OUT:
 			case PGRES_COPY_IN:
 				Py_INCREF(Py_None);
 				return Py_None;
 			default:
 				PyErr_SetString(PGError, "internal error: "
-											"unknown result status.");
+								"unknown result status.");
 				break;
 		}
 
@@ -1111,7 +1137,7 @@ pg_query(pgobject * self, PyObject * args)
 static PyObject *
 pg_putline(pgobject * self, PyObject * args)
 {
-	char           *line;
+	char	   *line;
 
 	/* reads args */
 	if (!PyArg_ParseTuple(args, "s", &line))
@@ -1130,15 +1156,15 @@ pg_putline(pgobject * self, PyObject * args)
 static PyObject *
 pg_getline(pgobject * self, PyObject * args)
 {
-	char           *line;
-	PyObject       *str;
-	int             ret;
+	char	   *line;
+	PyObject   *str;
+	int			ret;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method getline() takes no parameters.");
+						"method getline() takes no parameters.");
 		return NULL;
 	}
 
@@ -1177,7 +1203,7 @@ pg_endcopy(pgobject * self, PyObject * args)
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method endcopy() takes no parameters.");
+						"method endcopy() takes no parameters.");
 		return NULL;
 	}
 
@@ -1186,16 +1212,17 @@ pg_endcopy(pgobject * self, PyObject * args)
 	Py_INCREF(Py_None);
 	return Py_None;
 }
+
 #endif							/* DIRECT_ACCESS */
 
 
 static PyObject *
-pg_print(pgqueryobject *self, FILE *fp, int flags)
+pg_print(pgqueryobject * self, FILE *fp, int flags)
 {
-	PQprintOpt		op;
+	PQprintOpt	op;
 
 	memset(&op, 0, sizeof(op));
-	op.align = 1; 
+	op.align = 1;
 	op.header = 1;
 	op.fieldSep = "|";
 	op.pager = 1;
@@ -1207,20 +1234,25 @@ pg_print(pgqueryobject *self, FILE *fp, int flags)
 static PyObject *
 pg_inserttable(pgobject * self, PyObject * args)
 {
-	PGresult       *result;
-	char           *table, *buffer, *temp;
-	char            temp_buffer[256];
-	PyObject       *list, *sublist, *item;
-	PyObject       *(*getitem) (PyObject *, int);
-	PyObject       *(*getsubitem) (PyObject *, int);
-	int             i, j;
+	PGresult   *result;
+	char	   *table,
+			   *buffer,
+			   *temp;
+	char		temp_buffer[256];
+	PyObject   *list,
+			   *sublist,
+			   *item;
+	PyObject   *(*getitem) (PyObject *, int);
+	PyObject   *(*getsubitem) (PyObject *, int);
+	int			i,
+				j;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "sO:filter", &table, &list))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"tableinsert(table, content), with table (string) "
-				   "and content (list).");
+					  "tableinsert(table, content), with table (string) "
+						"and content (list).");
 		return NULL;
 	}
 
@@ -1232,7 +1264,7 @@ pg_inserttable(pgobject * self, PyObject * args)
 	else
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"second arg must be some kind of array.");
+						"second arg must be some kind of array.");
 		return NULL;
 	}
 
@@ -1242,7 +1274,7 @@ pg_inserttable(pgobject * self, PyObject * args)
 		if (!PyTuple_Check(sublist) && !PyList_Check(sublist))
 		{
 			PyErr_SetString(PyExc_TypeError,
-					"second arg must contain some kind of arrays.");
+						 "second arg must contain some kind of arrays.");
 			return NULL;
 		}
 	}
@@ -1284,7 +1316,7 @@ pg_inserttable(pgobject * self, PyObject * args)
 				PyArg_ParseTuple(item, "s", &temp);
 			else if (PyInt_Check(item))
 			{
-				int             k;
+				int			k;
 
 				PyArg_ParseTuple(item, "i", &k);
 				sprintf(temp_buffer, "%d", k);
@@ -1292,7 +1324,7 @@ pg_inserttable(pgobject * self, PyObject * args)
 			}
 			else if (PyLong_Check(item))
 			{
-				long            k;
+				long		k;
 
 				PyArg_ParseTuple(item, "l", &k);
 				sprintf(temp_buffer, "%ld", k);
@@ -1300,7 +1332,7 @@ pg_inserttable(pgobject * self, PyObject * args)
 			}
 			else if (PyFloat_Check(item))
 			{
-				double          k;
+				double		k;
 
 				PyArg_ParseTuple(item, "d", &k);
 				sprintf(temp_buffer, "%g", k);
@@ -1310,8 +1342,8 @@ pg_inserttable(pgobject * self, PyObject * args)
 			{
 				free(buffer);
 				PyErr_SetString(PyExc_ValueError,
-						"items must be strings, integers, "
-						   "longs or double (real).");
+								"items must be strings, integers, "
+								"longs or double (real).");
 				return NULL;
 			}
 
@@ -1340,21 +1372,21 @@ pg_inserttable(pgobject * self, PyObject * args)
 
 /* connection object methods */
 static struct PyMethodDef pgobj_methods[] = {
-	{"query",		(PyCFunction) pg_query, 1},			/* query method */
-	{"reset",		(PyCFunction) pg_reset, 1},			/* connection reset */
-	{"getnotify",	(PyCFunction) pg_getnotify, 1},		/* checks for notify */
-	{"inserttable",	(PyCFunction) pg_inserttable, 1},	/* table insert */
+	{"query", (PyCFunction) pg_query, 1},		/* query method */
+	{"reset", (PyCFunction) pg_reset, 1},		/* connection reset */
+	{"getnotify", (PyCFunction) pg_getnotify, 1},		/* checks for notify */
+	{"inserttable", (PyCFunction) pg_inserttable, 1},	/* table insert */
 
 #ifdef DIRECT_ACCESS
-	{"putline",		(PyCFunction) pg_putline, 1},	/* direct access: putline */
-	{"getline",		(PyCFunction) pg_getline, 1},	/* direct access: getline */
-	{"endcopy",		(PyCFunction) pg_endcopy, 1},	/* direct access: endcopy */
+	{"putline", (PyCFunction) pg_putline, 1},	/* direct access: putline */
+	{"getline", (PyCFunction) pg_getline, 1},	/* direct access: getline */
+	{"endcopy", (PyCFunction) pg_endcopy, 1},	/* direct access: endcopy */
 #endif							/* DIRECT_ACCESS */
 
 #ifdef LARGE_OBJECTS
-	{"locreate",	(PyCFunction) pg_locreate, 1},	/* creates large object */
-	{"getlo",		(PyCFunction) pg_getlo, 1},		/* get lo from oid */
-	{"loimport",	(PyCFunction) pg_loimport, 1},	/* imports lo from file */
+	{"locreate", (PyCFunction) pg_locreate, 1}, /* creates large object */
+	{"getlo", (PyCFunction) pg_getlo, 1},		/* get lo from oid */
+	{"loimport", (PyCFunction) pg_loimport, 1}, /* imports lo from file */
 #endif							/* LARGE_OBJECTS */
 
 	{NULL, NULL}				/* sentinel */
@@ -1401,7 +1433,7 @@ pg_getattr(pgobject * self, char *name)
 	/* attributes list */
 	if (!strcmp(name, "__members__"))
 	{
-		PyObject       *list = PyList_New(8);
+		PyObject   *list = PyList_New(8);
 
 		if (list)
 		{
@@ -1444,10 +1476,10 @@ staticforward PyTypeObject PgType = {
 
 /* query object methods */
 static struct PyMethodDef pgquery_methods[] = {
-	{"getresult",	(PyCFunction) pg_getresult, 1},		/* get last result */
-	{"fieldname",	(PyCFunction) pg_fieldname, 1},		/* get field name */
-	{"fieldnum",	(PyCFunction) pg_fieldnum, 1},		/* get field number */
-	{"listfields",	(PyCFunction) pg_listfields, 1},	/* list fields names */
+	{"getresult", (PyCFunction) pg_getresult, 1},		/* get last result */
+	{"fieldname", (PyCFunction) pg_fieldname, 1},		/* get field name */
+	{"fieldnum", (PyCFunction) pg_fieldnum, 1}, /* get field number */
+	{"listfields", (PyCFunction) pg_listfields, 1},		/* list fields names */
 	{NULL, NULL}				/* sentinel */
 };
 
@@ -1466,9 +1498,9 @@ staticforward PyTypeObject PgQueryType = {
 	sizeof(pgqueryobject),		/* tp_basicsize */
 	0,							/* tp_itemsize */
 	/* methods */
-	(destructor) pg_querydealloc,/* tp_dealloc */
+	(destructor) pg_querydealloc,		/* tp_dealloc */
 	(printfunc) pg_print,		/* tp_print */
-	(getattrfunc) pg_querygetattr,/* tp_getattr */
+	(getattrfunc) pg_querygetattr,		/* tp_getattr */
 	0,							/* tp_setattr */
 	0,							/* tp_compare */
 	0,							/* tp_repr */
@@ -1487,14 +1519,14 @@ staticforward PyTypeObject PgQueryType = {
 #ifdef DEFAULT_VARS
 
 /* gets default host */
-PyObject       *
-pggetdefhost(PyObject *self, PyObject *args)
+PyObject   *
+pggetdefhost(PyObject * self, PyObject * args)
 {
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method get_defhost() takes no parameter.");
+						"method get_defhost() takes no parameter.");
 		return NULL;
 	}
 
@@ -1503,17 +1535,17 @@ pggetdefhost(PyObject *self, PyObject *args)
 }
 
 /* sets default host */
-PyObject       *
-pgsetdefhost(PyObject * self, PyObject *args)
+PyObject   *
+pgsetdefhost(PyObject * self, PyObject * args)
 {
-	char           *temp = NULL;
-	PyObject       *old;
+	char	   *temp = NULL;
+	PyObject   *old;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "z", &temp))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"set_defhost(name), with name (string/None).");
+						"set_defhost(name), with name (string/None).");
 		return NULL;
 	}
 
@@ -1532,14 +1564,14 @@ pgsetdefhost(PyObject * self, PyObject *args)
 }
 
 /* gets default base */
-PyObject       *
-pggetdefbase(PyObject * self, PyObject *args)
+PyObject   *
+pggetdefbase(PyObject * self, PyObject * args)
 {
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method get_defbase() takes no parameter.");
+						"method get_defbase() takes no parameter.");
 		return NULL;
 	}
 
@@ -1548,17 +1580,17 @@ pggetdefbase(PyObject * self, PyObject *args)
 }
 
 /* sets default base */
-PyObject       *
-pgsetdefbase(PyObject * self, PyObject *args)
+PyObject   *
+pgsetdefbase(PyObject * self, PyObject * args)
 {
-	char           *temp = NULL;
-	PyObject       *old;
+	char	   *temp = NULL;
+	PyObject   *old;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "z", &temp))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"set_defbase(name), with name (string/None).");
+						"set_defbase(name), with name (string/None).");
 		return NULL;
 	}
 
@@ -1577,14 +1609,14 @@ pgsetdefbase(PyObject * self, PyObject *args)
 }
 
 /* gets default options */
-PyObject       *
-pggetdefopt(PyObject * self, PyObject *args)
+PyObject   *
+pggetdefopt(PyObject * self, PyObject * args)
 {
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method get_defopt() takes no parameter.");
+						"method get_defopt() takes no parameter.");
 		return NULL;
 	}
 
@@ -1593,17 +1625,17 @@ pggetdefopt(PyObject * self, PyObject *args)
 }
 
 /* sets default opt */
-PyObject       *
-pgsetdefopt(PyObject * self, PyObject *args)
+PyObject   *
+pgsetdefopt(PyObject * self, PyObject * args)
 {
-	char           *temp = NULL;
-	PyObject       *old;
+	char	   *temp = NULL;
+	PyObject   *old;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "z", &temp))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"set_defopt(name), with name (string/None).");
+						"set_defopt(name), with name (string/None).");
 		return NULL;
 	}
 
@@ -1622,14 +1654,14 @@ pgsetdefopt(PyObject * self, PyObject *args)
 }
 
 /* gets default tty */
-PyObject       *
-pggetdeftty(PyObject * self, PyObject *args)
+PyObject   *
+pggetdeftty(PyObject * self, PyObject * args)
 {
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method get_deftty() takes no parameter.");
+						"method get_deftty() takes no parameter.");
 		return NULL;
 	}
 
@@ -1638,17 +1670,17 @@ pggetdeftty(PyObject * self, PyObject *args)
 }
 
 /* sets default tty */
-PyObject       *
-pgsetdeftty(PyObject * self, PyObject *args)
+PyObject   *
+pgsetdeftty(PyObject * self, PyObject * args)
 {
-	char           *temp = NULL;
-	PyObject       *old;
+	char	   *temp = NULL;
+	PyObject   *old;
 
 	/* gets arguments */
 	if (!PyArg_ParseTuple(args, "z", &temp))
 	{
 		PyErr_SetString(PyExc_TypeError,
-				"set_deftty(name), with name (string/None).");
+						"set_deftty(name), with name (string/None).");
 		return NULL;
 	}
 
@@ -1667,16 +1699,16 @@ pgsetdeftty(PyObject * self, PyObject *args)
 }
 
 /* gets default port */
-PyObject       *
-pggetdefport(PyObject * self, PyObject *args)
+PyObject   *
+pggetdefport(PyObject * self, PyObject * args)
 {
-	char           *temp;
+	char	   *temp;
 
 	/* checks args */
 	if (!PyArg_ParseTuple(args, ""))
 	{
 		PyErr_SetString(PyExc_SyntaxError,
-				"method get_defport() takes no parameter.");
+						"method get_defport() takes no parameter.");
 		return NULL;
 	}
 
@@ -1685,18 +1717,19 @@ pggetdefport(PyObject * self, PyObject *args)
 }
 
 /* sets default port */
-PyObject       *
-pgsetdefport(PyObject * self, PyObject *args)
+PyObject   *
+pgsetdefport(PyObject * self, PyObject * args)
 {
-	long int        port = -2;
-	char            buffer[64], *temp;
-	PyObject       *old;
+	long int	port = -2;
+	char		buffer[64],
+			   *temp;
+	PyObject   *old;
 
 	/* gets arguments */
 	if ((!PyArg_ParseTuple(args, "l", &port)) || (port < -1))
 	{
 		PyErr_SetString(PyExc_TypeError, "set_defport(port), with port "
-				   "(positive integer/-1).");
+						"(positive integer/-1).");
 		return NULL;
 	}
 
@@ -1719,29 +1752,31 @@ pgsetdefport(PyObject * self, PyObject *args)
 /* List of functions defined in the module */
 
 static struct PyMethodDef pg_methods[] = {
-	{"connect", (PyCFunction) pgconnect, 3},/* connect to a postgres database */
+	{"connect", (PyCFunction) pgconnect, 3},	/* connect to a postgres
+												 * database */
 #ifdef DEFAULT_VARS
-	{"get_defhost",	pggetdefhost, 1},		/* gets default host */
-	{"set_defhost",	pgsetdefhost, 1},		/* sets default host */
-	{"get_defbase",	pggetdefbase, 1},		/* gets default base */
-	{"set_defbase",	pgsetdefbase, 1},		/* sets default base */
-	{"get_defopt",	pggetdefopt, 1},		/* gets default options */
-	{"set_defopt",	pgsetdefopt, 1},		/* sets default options */
-	{"get_deftty",	pggetdeftty, 1},		/* gets default debug tty */
-	{"set_deftty",	pgsetdeftty, 1},		/* sets default debug tty */
-	{"get_defport",	pggetdefport, 1},		/* gets default port */
-	{"set_defport",	pgsetdefport, 1},		/* sets default port */
+	{"get_defhost", pggetdefhost, 1},	/* gets default host */
+	{"set_defhost", pgsetdefhost, 1},	/* sets default host */
+	{"get_defbase", pggetdefbase, 1},	/* gets default base */
+	{"set_defbase", pgsetdefbase, 1},	/* sets default base */
+	{"get_defopt", pggetdefopt, 1},		/* gets default options */
+	{"set_defopt", pgsetdefopt, 1},		/* sets default options */
+	{"get_deftty", pggetdeftty, 1},		/* gets default debug tty */
+	{"set_deftty", pgsetdeftty, 1},		/* sets default debug tty */
+	{"get_defport", pggetdefport, 1},	/* gets default port */
+	{"set_defport", pgsetdefport, 1},	/* sets default port */
 #endif							/* DEFAULT_VARS */
 	{NULL, NULL}				/* sentinel */
 };
 
-static char pg__doc__[] = "Python interface to PostgreSQL DB"; 
+static char pg__doc__[] = "Python interface to PostgreSQL DB";
 
 /* Initialization function for the module */
 void
 initpg(void)
 {
-	PyObject       *mod, *dict;
+	PyObject   *mod,
+			   *dict;
 
 	/* Create the module and add the functions */
 	mod = Py_InitModule4("pg", pg_methods, pg__doc__, NULL, PYTHON_API_VERSION);
@@ -1765,11 +1800,16 @@ initpg(void)
 
 #ifdef DEFAULT_VARS
 	/* prepares default values */
-	Py_INCREF(Py_None); pg_default_host = Py_None;
-	Py_INCREF(Py_None); pg_default_base = Py_None;
-	Py_INCREF(Py_None); pg_default_opt = Py_None;
-	Py_INCREF(Py_None); pg_default_port = Py_None;
-	Py_INCREF(Py_None); pg_default_tty = Py_None;
+	Py_INCREF(Py_None);
+	pg_default_host = Py_None;
+	Py_INCREF(Py_None);
+	pg_default_base = Py_None;
+	Py_INCREF(Py_None);
+	pg_default_opt = Py_None;
+	Py_INCREF(Py_None);
+	pg_default_port = Py_None;
+	Py_INCREF(Py_None);
+	pg_default_tty = Py_None;
 #endif							/* DEFAULT_VARS */
 
 	/* Check for errors */