summaryrefslogtreecommitdiffabout
path: root/src/mysql.c
Side-by-side diff
Diffstat (limited to 'src/mysql.c') (more/less context) (show whitespace changes)
-rw-r--r--src/mysql.c46
1 files changed, 19 insertions, 27 deletions
diff --git a/src/mysql.c b/src/mysql.c
index d788a92..ac7e0f7 100644
--- a/src/mysql.c
+++ b/src/mysql.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_mysql_mark(struct sql_connect *conn)
@@ -30,3 +29,3 @@ s_mysql_mark(struct sql_connect *conn)
-scm_sizet
+static scm_sizet
s_mysql_free(struct sql_connect *conn)
@@ -40,5 +39,6 @@ s_mysql_free(struct sql_connect *conn)
-SCM
-s_mysql_connect (char *hostname, int port,
- char *dbname, char *user, char *pass, const char *why)
+static SCM
+s_mysql_connect (const char *hostname, int port,
+ const char *dbname, const char *user, const char *pass,
+ const char *why)
{
@@ -47,3 +47,3 @@ s_mysql_connect (char *hostname, int port,
struct sql_connect *conn;
- char *socket_path = NULL;
+ const char *socket_path = NULL;
@@ -74,4 +74,4 @@ s_mysql_connect (char *hostname, int port,
-SCM
-s_mysql_query(struct sql_connect *conn, char *query)
+static SCM
+s_mysql_query(struct sql_connect *conn, const char *query)
{
@@ -101,5 +101,4 @@ s_mysql_query(struct sql_connect *conn, char *query)
for (j = 0; j < nfields; j++) {
- SCM new_elt;
- SCM_NEWCELL(new_elt);
- SCM_SETCAR(new_elt, scm_makfrom0str(row[j]));
+ SCM new_elt = scm_cons(scm_makfrom0str(row[j]),
+ SCM_EOL);
if (head == SCM_EOL)
@@ -111,8 +110,3 @@ s_mysql_query(struct sql_connect *conn, char *query)
- 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)
@@ -123,4 +117,2 @@ s_mysql_query(struct sql_connect *conn, char *query)
}
- if (row_head != SCM_EOL)
- SCM_SETCDR(row_tail, SCM_EOL);
cell = row_head;
@@ -139,3 +131,3 @@ s_mysql_query(struct sql_connect *conn, char *query)
-void
+static void
s_mysql_close(struct sql_connect *conn)

Return to:

Send suggestions and report system problems to the System administrator.