Author: cito
Date: Fri Aug 19 15:18:32 2011
New Revision: 434
Log:
More code cosmetics (consitent whitespace handling).
Modified:
trunk/module/pgmodule.c
Modified: trunk/module/pgmodule.c
==============================================================================
--- trunk/module/pgmodule.c Fri Aug 19 13:58:22 2011 (r433)
+++ trunk/module/pgmodule.c Fri Aug 19 15:18:32 2011 (r434)
@@ -206,7 +206,7 @@
/* checks connection validity */
static int
-check_cnx_obj(pgobject * self)
+check_cnx_obj(pgobject *self)
{
if (!self->valid)
{
@@ -219,7 +219,7 @@
#ifdef LARGE_OBJECTS
/* checks large object validity */
static int
-check_lo_obj(pglargeobject * self, int level)
+check_lo_obj(pglargeobject *self, int level)
{
if (!check_cnx_obj(self->pgcnx))
return 0;
@@ -254,7 +254,7 @@
/* checks source object validity */
static int
-check_source_obj(pgsourceobject * self, int level)
+check_source_obj(pgsourceobject *self, int level)
{
if (!self->valid)
{
@@ -499,14 +499,14 @@
}
/* prototypes for constructors */
-static pgsourceobject *pgsource_new(pgobject * pgcnx);
+static pgsourceobject *pgsource_new(pgobject *pgcnx);
/* --------------------------------------------------------------------- */
/* PG SOURCE OBJECT IMPLEMENTATION */
/* constructor (internal use only) */
static pgsourceobject *
-pgsource_new(pgobject * pgcnx)
+pgsource_new(pgobject *pgcnx)
{
pgsourceobject *npgobj;
@@ -526,7 +526,7 @@
/* destructor */
static void
-pgsource_dealloc(pgsourceobject * self)
+pgsource_dealloc(pgsourceobject *self)
{
if (self->last_result)
PQclear(self->last_result);
@@ -541,7 +541,7 @@
"All instances of the query object can no longer be used after this call.";
static PyObject *
-pgsource_close(pgsourceobject * self, PyObject * args)
+pgsource_close(pgsourceobject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -574,7 +574,7 @@
"to get result rows.";
static PyObject *
-pgsource_execute(pgsourceobject * self, PyObject * args)
+pgsource_execute(pgsourceobject *self, PyObject *args)
{
char *query;
@@ -668,7 +668,7 @@
"oidstatus() -- return oid of last inserted row (if available).";
static PyObject *
-pgsource_oidstatus(pgsourceobject * self, PyObject * args)
+pgsource_oidstatus(pgsourceobject *self, PyObject *args)
{
Oid oid;
@@ -701,7 +701,7 @@
"If size equals -1, all rows are fetched.";
static PyObject *
-pgsource_fetch(pgsourceobject * self, PyObject * args)
+pgsource_fetch(pgsourceobject *self, PyObject *args)
{
PyObject *rowtuple,
*reslist,
@@ -764,7 +764,7 @@
/* changes current row (internal wrapper for all "move" methods) */
static PyObject *
-pgsource_move(pgsourceobject * self, PyObject * args, int move)
+pgsource_move(pgsourceobject *self, PyObject *args, int move)
{
/* checks validity */
if (!check_source_obj(self, CHECK_RESULT | CHECK_DQL))
@@ -808,7 +808,7 @@
"movefirst() -- move to first result row.";
static PyObject *
-pgsource_movefirst(pgsourceobject * self, PyObject * args)
+pgsource_movefirst(pgsourceobject *self, PyObject *args)
{
return pgsource_move(self, args, QUERY_MOVEFIRST);
}
@@ -818,7 +818,7 @@
"movelast() -- move to last valid result row.";
static PyObject *
-pgsource_movelast(pgsourceobject * self, PyObject * args)
+pgsource_movelast(pgsourceobject *self, PyObject *args)
{
return pgsource_move(self, args, QUERY_MOVELAST);
}
@@ -828,7 +828,7 @@
"movenext() -- move to next result row.";
static PyObject *
-pgsource_movenext(pgsourceobject * self, PyObject * args)
+pgsource_movenext(pgsourceobject *self, PyObject *args)
{
return pgsource_move(self, args, QUERY_MOVENEXT);
}
@@ -838,14 +838,14 @@
"moveprev() -- move to previous result row.";
static PyObject *
-pgsource_moveprev(pgsourceobject * self, PyObject * args)
+pgsource_moveprev(pgsourceobject *self, PyObject *args)
{
return pgsource_move(self, args, QUERY_MOVEPREV);
}
/* finds field number from string/integer (internal use only) */
static int
-pgsource_fieldindex(pgsourceobject * self, PyObject * param, const char *usage)
+pgsource_fieldindex(pgsourceobject *self, PyObject *param, const char *usage)
{
int num;
@@ -876,7 +876,7 @@
/* builds field information from position (internal use only) */
static PyObject *
-pgsource_buildinfo(pgsourceobject * self, int num)
+pgsource_buildinfo(pgsourceobject *self, int num)
{
PyObject *result;
@@ -901,7 +901,7 @@
"(position, name, type oid).";
static PyObject *
-pgsource_listinfo(pgsourceobject * self, PyObject * args)
+pgsource_listinfo(pgsourceobject *self, PyObject *args)
{
int i;
PyObject *result,
@@ -944,7 +944,7 @@
"(position, name, type oid).";
static PyObject *
-pgsource_fieldinfo(pgsourceobject * self, PyObject * args)
+pgsource_fieldinfo(pgsourceobject *self, PyObject *args)
{
static const char short_usage[] =
"fieldinfo(desc), with desc (string|integer).";
@@ -971,7 +971,7 @@
"field(string|integer) -- return specified field value.";
static PyObject *
-pgsource_field(pgsourceobject * self, PyObject * args)
+pgsource_field(pgsourceobject *self, PyObject *args)
{
static const char short_usage[] =
"field(desc), with desc (string|integer).";
@@ -1022,7 +1022,7 @@
/* gets query object attributes */
static PyObject *
-pgsource_getattr(pgsourceobject * self, char *name)
+pgsource_getattr(pgsourceobject *self, char *name)
{
/* pg connection object */
if (!strcmp(name, "pgcnx"))
@@ -1080,7 +1080,7 @@
/* sets query object attributes */
static int
-pgsource_setattr(pgsourceobject * self, char *name, PyObject * v)
+pgsource_setattr(pgsourceobject *self, char *name, PyObject *v)
{
/* arraysize */
if (!strcmp(name, "arraysize"))
@@ -1101,7 +1101,7 @@
}
static PyObject *
-pgsource_repr(pgsourceobject * self)
+pgsource_repr(pgsourceobject *self)
{
return PyString_FromString("<pg source object>");
}
@@ -1109,7 +1109,7 @@
/* returns source object as string in human readable format */
static PyObject *
-pgsource_str(pgsourceobject * self)
+pgsource_str(pgsourceobject *self)
{
switch (self->result_type)
{
@@ -1153,7 +1153,7 @@
/* constructor (internal use only) */
static pglargeobject *
-pglarge_new(pgobject * pgcnx, Oid oid)
+pglarge_new(pgobject *pgcnx, Oid oid)
{
pglargeobject *npglo;
@@ -1170,7 +1170,7 @@
/* destructor */
static void
-pglarge_dealloc(pglargeobject * self)
+pglarge_dealloc(pglargeobject *self)
{
if (self->lo_fd >= 0 && check_cnx_obj(self->pgcnx))
lo_close(self->pgcnx->cnx, self->lo_fd);
@@ -1185,7 +1185,7 @@
"(INV_READ, INV_WRITE constants defined by module).";
static PyObject *
-pglarge_open(pglargeobject * self, PyObject * args)
+pglarge_open(pglargeobject *self, PyObject *args)
{
int mode,
fd;
@@ -1219,7 +1219,7 @@
"close() -- close access to large object data.";
static PyObject *
-pglarge_close(pglargeobject * self, PyObject * args)
+pglarge_close(pglargeobject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -1252,7 +1252,7 @@
"Object must be opened in read mode before calling this method.";
static PyObject *
-pglarge_read(pglargeobject * self, PyObject * args)
+pglarge_read(pglargeobject *self, PyObject *args)
{
int size;
PyObject *buffer;
@@ -1295,7 +1295,7 @@
"Object must be opened in read mode before calling this method.";
static PyObject *
-pglarge_write(pglargeobject * self, PyObject * args)
+pglarge_write(pglargeobject *self, PyObject *args)
{
char *buffer;
int size,
@@ -1333,7 +1333,7 @@
"constants defined by module.";
static PyObject *
-pglarge_lseek(pglargeobject * self, PyObject * args)
+pglarge_lseek(pglargeobject *self, PyObject *args)
{
/* offset and whence are initialized to keep compiler happy */
int ret,
@@ -1369,7 +1369,7 @@
"Object must be opened before calling this method.";
static PyObject *
-pglarge_size(pglargeobject * self, PyObject * args)
+pglarge_size(pglargeobject *self, PyObject *args)
{
int start,
end;
@@ -1418,7 +1418,7 @@
"Object must be opened before calling this method.";
static PyObject *
-pglarge_tell(pglargeobject * self, PyObject * args)
+pglarge_tell(pglargeobject *self, PyObject *args)
{
int start;
@@ -1451,7 +1451,7 @@
"Object must be closed when calling this method.";
static PyObject *
-pglarge_export(pglargeobject * self, PyObject * args)
+pglarge_export(pglargeobject *self, PyObject *args)
{
char *name;
@@ -1484,7 +1484,7 @@
"Object must be closed when calling this method.";
static PyObject *
-pglarge_unlink(pglargeobject * self, PyObject * args)
+pglarge_unlink(pglargeobject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -1526,7 +1526,7 @@
/* get attribute */
static PyObject *
-pglarge_getattr(pglargeobject * self, char *name)
+pglarge_getattr(pglargeobject *self, char *name)
{
/* list postgreSQL large object fields */
@@ -1586,7 +1586,7 @@
/* prints query object in human readable format */
static int
-pglarge_print(pglargeobject * self, FILE *fp, int flags)
+pglarge_print(pglargeobject *self, FILE *fp, int flags)
{
char print_buffer[128];
PyOS_snprintf(print_buffer, sizeof(print_buffer),
@@ -1629,7 +1629,7 @@
"using specified parameters (optionals, keywords aware).";
static PyObject *
-pgconnect(pgobject * self, PyObject * args, PyObject * dict)
+pgconnect(pgobject *self, PyObject *args, PyObject *dict)
{
static const char *kwlist[] = {"dbname", "host", "port", "opt",
"tty", "user", "passwd", NULL};
@@ -1713,7 +1713,7 @@
/* destructor */
static void
-pg_dealloc(pgobject * self)
+pg_dealloc(pgobject *self)
{
if (self->cnx)
{
@@ -1731,7 +1731,7 @@
"this call.";
static PyObject *
-pg_close(pgobject * self, PyObject * args)
+pg_close(pgobject *self, PyObject *args)
{
/* gets args */
if (!PyArg_ParseTuple(args, ""))
@@ -1757,7 +1757,7 @@
}
static void
-pgquery_dealloc(pgqueryobject * self)
+pgquery_dealloc(pgqueryobject *self)
{
if (self->last_result)
PQclear(self->last_result);
@@ -1772,7 +1772,7 @@
"this call.";
static PyObject *
-pg_reset(pgobject * self, PyObject * args)
+pg_reset(pgobject *self, PyObject *args)
{
if (!self->cnx)
{
@@ -1799,7 +1799,7 @@
"cancel() -- abandon processing of the current command.";
static PyObject *
-pg_cancel(pgobject * self, PyObject * args)
+pg_cancel(pgobject *self, PyObject *args)
{
if (!self->cnx)
{
@@ -1824,7 +1824,7 @@
"fileno() -- return database connection socket file handle.";
static PyObject *
-pg_fileno(pgobject * self, PyObject * args)
+pg_fileno(pgobject *self, PyObject *args)
{
if (!self->cnx)
{
@@ -1852,7 +1852,7 @@
"ntuples() -- returns number of tuples returned by query.";
static PyObject *
-pgquery_ntuples(pgqueryobject * self, PyObject * args)
+pgquery_ntuples(pgqueryobject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -1870,7 +1870,7 @@
"listfields() -- Lists field names from result.";
static PyObject *
-pgquery_listfields(pgqueryobject * self, PyObject * args)
+pgquery_listfields(pgqueryobject *self, PyObject *args)
{
int i,
n;
@@ -1905,7 +1905,7 @@
"fieldname() -- returns name of field from result from its position.";
static PyObject *
-pgquery_fieldname(pgqueryobject * self, PyObject * args)
+pgquery_fieldname(pgqueryobject *self, PyObject *args)
{
int i;
char *name;
@@ -1935,7 +1935,7 @@
"fieldnum() -- returns position in query for field from its name.";
static PyObject *
-pgquery_fieldnum(pgqueryobject * self, PyObject * args)
+pgquery_fieldnum(pgqueryobject *self, PyObject *args)
{
int num;
char *name;
@@ -1964,7 +1964,7 @@
"by the server.";
static PyObject *
-pgquery_getresult(pgqueryobject * self, PyObject * args)
+pgquery_getresult(pgqueryobject *self, PyObject *args)
{
PyObject *rowtuple,
*reslist,
@@ -2089,7 +2089,7 @@
"as the labels.";
static PyObject *
-pgquery_dictresult(pgqueryobject * self, PyObject * args)
+pgquery_dictresult(pgqueryobject *self, PyObject *args)
{
PyObject *dict,
*reslist,
@@ -2213,7 +2213,7 @@
"getnotify() -- get database notify for this connection.";
static PyObject *
-pg_getnotify(pgobject * self, PyObject * args)
+pg_getnotify(pgobject *self, PyObject *args)
{
PGnotify *notify;
@@ -2269,7 +2269,7 @@
"source() -- creates a new source object for this connection";
static PyObject *
-pg_source(pgobject * self, PyObject * args)
+pg_source(pgobject *self, PyObject *args)
{
/* checks validity */
if (!check_cnx_obj(self))
@@ -2292,7 +2292,7 @@
" using sql (string) request.";
static PyObject *
-pg_query(pgobject * self, PyObject * args)
+pg_query(pgobject *self, PyObject *args)
{
char *query;
PGresult *result;
@@ -2392,7 +2392,7 @@
/* direct acces function : putline */
static PyObject *
-pg_putline(pgobject * self, PyObject * args)
+pg_putline(pgobject *self, PyObject *args)
{
char *line;
@@ -2424,7 +2424,7 @@
"getline() -- gets a line directly from the backend.";
static PyObject *
-pg_getline(pgobject * self, PyObject * args)
+pg_getline(pgobject *self, PyObject *args)
{
char line[MAX_BUFFER_SIZE];
PyObject *str = NULL; /* GCC */
@@ -2467,7 +2467,7 @@
"endcopy() -- synchronizes client and server";
static PyObject *
-pg_endcopy(pgobject * self, PyObject * args)
+pg_endcopy(pgobject *self, PyObject *args)
{
if (!self->cnx)
{
@@ -2495,13 +2495,13 @@
#endif /* DIRECT_ACCESS */
static PyObject *
-pgquery_repr(pgqueryobject * self)
+pgquery_repr(pgqueryobject *self)
{
return PyString_FromString("<pg query result>");
}
static PyObject *
-pgquery_str(pgqueryobject * self)
+pgquery_str(pgqueryobject *self)
{
return format_result(self->last_result);
}
@@ -2512,7 +2512,7 @@
"list must be in the same order as in the table.";
static PyObject *
-pg_inserttable(pgobject * self, PyObject * args)
+pg_inserttable(pgobject *self, PyObject *args)
{
PGresult *result;
char *table,
@@ -2736,7 +2736,7 @@
"Returns the current transaction status.";
static PyObject *
-pg_transaction(pgobject * self, PyObject * args)
+pg_transaction(pgobject *self, PyObject *args)
{
if (!self->cnx)
{
@@ -2760,7 +2760,7 @@
"Looks up a current parameter setting.";
static PyObject *
-pg_parameter(pgobject * self, PyObject * args)
+pg_parameter(pgobject *self, PyObject *args)
{
const char *name;
@@ -2890,7 +2890,7 @@
"locreate() -- creates a new large object in the database.";
static PyObject *
-pg_locreate(pgobject * self, PyObject * args)
+pg_locreate(pgobject *self, PyObject *args)
{
int mode;
Oid lo_oid;
@@ -2923,7 +2923,7 @@
"getlo(long) -- create a large object instance for the specified oid.";
static PyObject *
-pg_getlo(pgobject * self, PyObject * args)
+pg_getlo(pgobject *self, PyObject *args)
{
int lo_oid;
@@ -2953,7 +2953,7 @@
"loimport(string) -- create a new large object from specified file.";
static PyObject *
-pg_loimport(pgobject * self, PyObject * args)
+pg_loimport(pgobject *self, PyObject *args)
{
char *name;
Oid lo_oid;
@@ -3023,7 +3023,7 @@
/* get attribute */
static PyObject *
-pg_getattr(pgobject * self, char *name)
+pg_getattr(pgobject *self, char *name)
{
/*
* Although we could check individually, there are only a few
@@ -3153,7 +3153,7 @@
/* gets query object attributes */
static PyObject *
-pgquery_getattr(pgqueryobject * self, char *name)
+pgquery_getattr(pgqueryobject *self, char *name)
{
/* list postgreSQL connection fields */
return Py_FindMethod(pgquery_methods, (PyObject *) self, name);
@@ -3265,7 +3265,7 @@
"set_decimal(cls) -- set a decimal type to be used for numeric values.";
static PyObject *
-set_decimal(PyObject * self, PyObject * args)
+set_decimal(PyObject *self, PyObject *args)
{
PyObject *ret = NULL;
PyObject *cls;
@@ -3295,7 +3295,7 @@
"get_defhost() -- return default database host.";
static PyObject *
-pggetdefhost(PyObject * self, PyObject * args)
+pggetdefhost(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3314,7 +3314,7 @@
"set_defhost(string) -- set default database host. Return previous value.";
static PyObject *
-pgsetdefhost(PyObject * self, PyObject * args)
+pgsetdefhost(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3346,7 +3346,7 @@
"get_defbase() -- return default database name.";
static PyObject *
-pggetdefbase(PyObject * self, PyObject * args)
+pggetdefbase(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3365,7 +3365,7 @@
"set_defbase(string) -- set default database name. Return previous value";
static PyObject *
-pgsetdefbase(PyObject * self, PyObject * args)
+pgsetdefbase(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3397,7 +3397,7 @@
"get_defopt() -- return default database options.";
static PyObject *
-pggetdefopt(PyObject * self, PyObject * args)
+pggetdefopt(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3416,7 +3416,7 @@
"set_defopt(string) -- set default database options. Return previous value.";
static PyObject *
-pgsetdefopt(PyObject * self, PyObject * args)
+pgsetdefopt(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3448,7 +3448,7 @@
"get_deftty() -- return default database debug terminal.";
static PyObject *
-pggetdeftty(PyObject * self, PyObject * args)
+pggetdeftty(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3468,7 +3468,7 @@
"Return previous value.";
static PyObject *
-pgsetdeftty(PyObject * self, PyObject * args)
+pgsetdeftty(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3500,7 +3500,7 @@
"get_defuser() -- return default database username.";
static PyObject *
-pggetdefuser(PyObject * self, PyObject * args)
+pggetdefuser(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3520,7 +3520,7 @@
"set_defuser() -- set default database username. Return previous value.";
static PyObject *
-pgsetdefuser(PyObject * self, PyObject * args)
+pgsetdefuser(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3552,7 +3552,7 @@
"set_defpasswd() -- set default database password.";
static PyObject *
-pgsetdefpasswd(PyObject * self, PyObject * args)
+pgsetdefpasswd(PyObject *self, PyObject *args)
{
char *temp = NULL;
PyObject *old;
@@ -3585,7 +3585,7 @@
"get_defport() -- return default database port.";
static PyObject *
-pggetdefport(PyObject * self, PyObject * args)
+pggetdefport(PyObject *self, PyObject *args)
{
/* checks args */
if (!PyArg_ParseTuple(args, ""))
@@ -3604,7 +3604,7 @@
"set_defport(integer) -- set default database port. Return previous value.";
static PyObject *
-pgsetdefport(PyObject * self, PyObject * args)
+pgsetdefport(PyObject *self, PyObject *args)
{
long int port = -2;
PyObject *old;
_______________________________________________
PyGreSQL mailing list
PyGreSQL@vex.net
http://mailman.vex.net/mailman/listinfo/pygresql
