diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-26 21:54:07 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-26 21:54:07 +0000 |
| commit | f60b650e9acd449b142c37e4fcc55390c62f4832 (patch) | |
| tree | 3f3e026b1db43a9344fb65e6a83d7534b7434ff0 /src/pgsql.c | |
| parent | 06e6d0bcfcd33203091a817e4423fdd12e1bcd68 (diff) | |
| download | gamma-f60b650e9acd449b142c37e4fcc55390c62f4832.tar.gz gamma-f60b650e9acd449b142c37e4fcc55390c62f4832.tar.bz2 | |
* NEWS: Update.
* configure.ac: Version number 1.1
* COPYING: GPLv3.
* Makefile.am: GPLv3.
* examples/whoisd.scm: GPLv3.
* m4/guile.m4: Require Guile v. 1.8 or later.
* scripts/Makefile.am: GPLv3.
* scripts/guile-doc-snarf.awk: GPLv3.
* src/.cvsignore (gettext.inc, gettext.scm): Remove.
* src/Makefile.am: Remove libguile-gettext.
* src/app.h: GPLv3.
* src/gsql_conn.c, src/gsql_lib.c, src/guile-sql.h, src/mysql.c,
src/pgsql.c: GPLv3; Guile v.>=1.8.
* src/gettext.sci, src/gettext.h, src/gettext.c: Remove.
* src/gettext.scm: New file.
Diffstat (limited to 'src/pgsql.c')
| -rw-r--r-- | src/pgsql.c | 44 |
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 @@ -3,6 +3,6 @@ - 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. @@ -13,5 +13,4 @@ - 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/>. */ @@ -24,3 +23,3 @@ -SCM +static SCM s_pgsql_mark(struct sql_connect *conn) @@ -30,3 +29,3 @@ s_pgsql_mark(struct sql_connect *conn) -scm_sizet +static scm_sizet s_pgsql_free(struct sql_connect *conn) @@ -40,5 +39,6 @@ s_pgsql_free(struct sql_connect *conn) -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) { @@ -64,3 +64,3 @@ s_pgsql_connect (char *hostname, int port, -SCM +static SCM result_to_list(PGresult *res) @@ -77,6 +77,4 @@ result_to_list(PGresult *res) 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) @@ -88,7 +86,3 @@ result_to_list(PGresult *res) - 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); @@ -100,4 +94,2 @@ result_to_list(PGresult *res) } - if (row_head != SCM_EOL) - SCM_SETCDR(row_tail, SCM_EOL); return row_head; @@ -105,4 +97,4 @@ result_to_list(PGresult *res) -SCM -s_pgsql_query(struct sql_connect *conn, char *query) +static SCM +s_pgsql_query(struct sql_connect *conn, const char *query) { @@ -139,3 +131,3 @@ s_pgsql_query(struct sql_connect *conn, char *query) -void +static void s_pgsql_close(struct sql_connect *conn) |