* psycopg/typecast_array.c (typecast_array_scan): set an initial

value for quotes to keep gcc happy.

	* psycopg/*.c: add missing static modifier on many functions.
This commit is contained in:
James Henstridge 2008-01-13 16:05:59 +00:00
parent 7d80c05748
commit f18881983b
11 changed files with 30 additions and 23 deletions

View File

@ -1,3 +1,10 @@
2008-01-14 James Henstridge <james@jamesh.id.au>
* psycopg/typecast_array.c (typecast_array_scan): set an initial
value for quotes to keep gcc happy.
* psycopg/*.c: add missing static modifier on many functions.
2008-01-12 James Henstridge <james@jamesh.id.au> 2008-01-12 James Henstridge <james@jamesh.id.au>
* tests/test_transaction.py * tests/test_transaction.py

View File

@ -45,14 +45,14 @@ asis_str(asisObject *self)
} }
} }
PyObject * static PyObject *
asis_getquoted(asisObject *self, PyObject *args) asis_getquoted(asisObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return asis_str(self); return asis_str(self);
} }
PyObject * static PyObject *
asis_conform(asisObject *self, PyObject *args) asis_conform(asisObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -183,14 +183,14 @@ binary_str(binaryObject *self)
return self->buffer; return self->buffer;
} }
PyObject * static PyObject *
binary_getquoted(binaryObject *self, PyObject *args) binary_getquoted(binaryObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return binary_str(self); return binary_str(self);
} }
PyObject * static PyObject *
binary_prepare(binaryObject *self, PyObject *args) binary_prepare(binaryObject *self, PyObject *args)
{ {
connectionObject *conn; connectionObject *conn;
@ -208,7 +208,7 @@ binary_prepare(binaryObject *self, PyObject *args)
return Py_None; return Py_None;
} }
PyObject * static PyObject *
binary_conform(binaryObject *self, PyObject *args) binary_conform(binaryObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -79,14 +79,14 @@ pydatetime_str(pydatetimeObject *self)
} }
} }
PyObject * static PyObject *
pydatetime_getquoted(pydatetimeObject *self, PyObject *args) pydatetime_getquoted(pydatetimeObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return pydatetime_str(self); return pydatetime_str(self);
} }
PyObject * static PyObject *
pydatetime_conform(pydatetimeObject *self, PyObject *args) pydatetime_conform(pydatetimeObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -82,21 +82,21 @@ list_quote(listObject *self)
return res; return res;
} }
PyObject * static PyObject *
list_str(listObject *self, PyObject *args) list_str(listObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return list_quote(self); return list_quote(self);
} }
PyObject * static PyObject *
list_getquoted(listObject *self, PyObject *args) list_getquoted(listObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return list_quote(self); return list_quote(self);
} }
PyObject * static PyObject *
list_prepare(listObject *self, PyObject *args) list_prepare(listObject *self, PyObject *args)
{ {
connectionObject *conn; connectionObject *conn;
@ -116,7 +116,7 @@ list_prepare(listObject *self, PyObject *args)
return Py_None; return Py_None;
} }
PyObject * static PyObject *
list_conform(listObject *self, PyObject *args) list_conform(listObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -55,14 +55,14 @@ pboolean_str(pbooleanObject *self)
#endif #endif
} }
PyObject * static PyObject *
pboolean_getquoted(pbooleanObject *self, PyObject *args) pboolean_getquoted(pbooleanObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return pboolean_str(self); return pboolean_str(self);
} }
PyObject * static PyObject *
pboolean_conform(pbooleanObject *self, PyObject *args) pboolean_conform(pbooleanObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -193,14 +193,14 @@ qstring_str(qstringObject *self)
return self->buffer; return self->buffer;
} }
PyObject * static PyObject *
qstring_getquoted(qstringObject *self, PyObject *args) qstring_getquoted(qstringObject *self, PyObject *args)
{ {
if (!PyArg_ParseTuple(args, "")) return NULL; if (!PyArg_ParseTuple(args, "")) return NULL;
return qstring_str(self); return qstring_str(self);
} }
PyObject * static PyObject *
qstring_prepare(qstringObject *self, PyObject *args) qstring_prepare(qstringObject *self, PyObject *args)
{ {
connectionObject *conn; connectionObject *conn;
@ -226,7 +226,7 @@ qstring_prepare(qstringObject *self, PyObject *args)
return Py_None; return Py_None;
} }
PyObject * static PyObject *
qstring_conform(qstringObject *self, PyObject *args) qstring_conform(qstringObject *self, PyObject *args)
{ {
PyObject *res, *proto; PyObject *res, *proto;

View File

@ -32,7 +32,7 @@
/* conn_notice_callback - process notices */ /* conn_notice_callback - process notices */
void static void
conn_notice_callback(void *args, const char *message) conn_notice_callback(void *args, const char *message)
{ {
connectionObject *self = (connectionObject *)args; connectionObject *self = (connectionObject *)args;

View File

@ -741,7 +741,7 @@ _psyco_curs_buildrow_with_factory(cursorObject *self, int row)
return _psyco_curs_buildrow_fill(self, res, row, n, 0); return _psyco_curs_buildrow_fill(self, res, row, n, 0);
} }
PyObject * static PyObject *
psyco_curs_fetchone(cursorObject *self, PyObject *args) psyco_curs_fetchone(cursorObject *self, PyObject *args)
{ {
PyObject *res; PyObject *res;
@ -795,7 +795,7 @@ psyco_curs_fetchone(cursorObject *self, PyObject *args)
"of tuples (by default) or using the sequence factory previously set in\n" \ "of tuples (by default) or using the sequence factory previously set in\n" \
"the `row_factory` attribute. Return `None` when no more data is available.\n" "the `row_factory` attribute. Return `None` when no more data is available.\n"
PyObject * static PyObject *
psyco_curs_fetchmany(cursorObject *self, PyObject *args, PyObject *kwords) psyco_curs_fetchmany(cursorObject *self, PyObject *args, PyObject *kwords)
{ {
int i; int i;
@ -870,7 +870,7 @@ psyco_curs_fetchmany(cursorObject *self, PyObject *args, PyObject *kwords)
"the sequence factory previously set in the `row_factory` attribute.\n" \ "the sequence factory previously set in the `row_factory` attribute.\n" \
"Return `None` when no more data is available.\n" "Return `None` when no more data is available.\n"
PyObject * static PyObject *
psyco_curs_fetchall(cursorObject *self, PyObject *args) psyco_curs_fetchall(cursorObject *self, PyObject *args)
{ {
int i, size; int i, size;

View File

@ -237,7 +237,7 @@ pq_set_critical(connectionObject *conn, const char *msg)
else conn->critical = NULL; else conn->critical = NULL;
} }
void static void
pq_clear_critical(connectionObject *conn) pq_clear_critical(connectionObject *conn)
{ {
/* sometimes we know that the notice analizer set a critical that /* sometimes we know that the notice analizer set a critical that
@ -283,7 +283,7 @@ pq_resolve_critical(connectionObject *conn, int close)
this function does not call any Py_*_ALLOW_THREADS macros */ this function does not call any Py_*_ALLOW_THREADS macros */
void static void
pq_clear_async(connectionObject *conn) pq_clear_async(connectionObject *conn)
{ {
PGresult *pgres; PGresult *pgres;

View File

@ -164,7 +164,7 @@ static int
typecast_array_scan(char *str, Py_ssize_t strlength, typecast_array_scan(char *str, Py_ssize_t strlength,
PyObject *curs, PyObject *base, PyObject *array) PyObject *curs, PyObject *base, PyObject *array)
{ {
int state, quotes; int state, quotes = 0;
Py_ssize_t length = 0, pos = 0; Py_ssize_t length = 0, pos = 0;
char *token; char *token;