aboutsummaryrefslogtreecommitdiff
path: root/src/pgsql.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pgsql.c')
-rw-r--r--src/pgsql.c44
1 files changed, 18 insertions, 26 deletions
diff --git a/src/pgsql.c b/src/pgsql.c
index 44b1fa6..011a4b7 100644
--- a/src/pgsql.c
+++ b/src/pgsql.c
@@ -1,49 +1,49 @@
/* This file is part of guile-sql.
Copyright (C) 2002 Sergey Poznyakoff
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <guile-sql.h>
#include <libpq-fe.h>
-SCM
+static SCM
s_pgsql_mark(struct sql_connect *conn)
{
return SCM_BOOL_F;
}
-scm_sizet
+static scm_sizet
s_pgsql_free(struct sql_connect *conn)
{
PGconn *pgconn = (PGconn*) conn->data;
if (!pgconn)
return 0;
PQfinish(pgconn);
return sizeof(pgconn);
}
-SCM
-s_pgsql_connect (char *hostname, int port,
- char *dbname, char *user, char *pass, const char *why)
+static SCM
+s_pgsql_connect (const char *hostname, int port,
+ const char *dbname, const char *user, const char *pass,
+ const char *why)
{
PGconn *pgconn;
char buf[24];
SCM smob;
struct sql_connect *conn;
@@ -59,55 +59,47 @@ s_pgsql_connect (char *hostname, int port,
smob = sql_connect_create("pgsql");
conn = (struct sql_connect *)SCM_CDR(smob);
conn->data = pgconn;
return smob;
}
-SCM
+static SCM
result_to_list(PGresult *res)
{
int i, j;
int ntuples = PQntuples(res);
int nfields = PQnfields(res);
SCM row_head = SCM_EOL, row_tail;
for (i = 0; i < ntuples; i++) {
SCM new_row;
SCM head = SCM_EOL, tail;
for (j = 0; j < nfields; j++) {
- SCM new_elt;
char *val = PQgetvalue(res, i, j);
- SCM_NEWCELL(new_elt);
- SCM_SETCAR(new_elt, scm_makfrom0str(val));
+ SCM new_elt = scm_cons(scm_makfrom0str(val), SCM_EOL);
if (head == SCM_EOL)
head = new_elt;
else
SCM_SETCDR(tail, new_elt);
tail = new_elt;
}
- if (head != SCM_EOL)
- SCM_SETCDR(tail, SCM_EOL);
-
- SCM_NEWCELL(new_row);
- SCM_SETCAR(new_row, head);
+ new_row = scm_cons(head, SCM_EOL);
if (row_head == SCM_EOL)
row_head = new_row;
else
SCM_SETCDR(row_tail, new_row);
row_tail = new_row;
}
- if (row_head != SCM_EOL)
- SCM_SETCDR(row_tail, SCM_EOL);
return row_head;
}
-SCM
-s_pgsql_query(struct sql_connect *conn, char *query)
+static SCM
+s_pgsql_query(struct sql_connect *conn, const char *query)
{
PGconn *pgconn = (PGconn*) conn->data;
PGresult *res;
SCM cell;
ExecStatusType stat;
@@ -134,13 +126,13 @@ s_pgsql_query(struct sql_connect *conn, char *query)
scm_makfrom0str(PQresStatus(stat))));
}
return cell;
}
-void
+static void
s_pgsql_close(struct sql_connect *conn)
{
PGconn *pgconn = (PGconn*) conn->data;
if (!pgconn)
return;
PQfinish(pgconn);

Return to:

Send suggestions and report system problems to the System administrator.