7 files changed, 60 insertions, 154 deletions

diff --git a/configure.ac b/configure.ac
index 15aeb87..0695551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,13 +31,13 @@ dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_LIBTOOL
 
-GINT_INIT(gint,[1.8])
+GINT_INIT(gint,[2.2.0])
 
 AC_SUBST(INCLUDEPATH)
 AC_MSG_CHECKING(for additional includes)
 AC_ARG_WITH([include-path],
             AC_HELP_STRING([--with-include-path=PATH],
                            [specify additional include paths; PATH is a ':' separated list of directories]),
diff --git a/src/gamma-expat.c b/src/gamma-expat.c
index a81d30e..cd3efaa 100644
--- a/src/gamma-expat.c
+++ b/src/gamma-expat.c
@@ -29,21 +29,21 @@ struct gamma_xml_parser
 
 static SCM
 gamma_xml_parser_create(XML_Parser parser)
 {
         struct gamma_xml_parser *gp;
 
-        gp = scm_malloc(sizeof (*gp));
+        gp = scm_gc_malloc(sizeof (*gp), "xml_parser");
         gp->parser = parser;
         SCM_RETURN_NEWSMOB(gamma_xml_parser_tag, gp);
 }
 
 #define GAMMA_XML_PARSER_PTR(smob)              \
         ((struct gamma_xml_parser *)SCM_CDR(smob))
 
-static scm_sizet
+static size_t
 gamma_xml_parser_free(SCM smob)
 {
         struct gamma_xml_parser *gp = GAMMA_XML_PARSER_PTR(smob);
         if (gp->parser) {
                 struct gamma_expat_user_data *udata =
                         XML_GetUserData(gp->parser);
@@ -81,25 +81,25 @@ gamma_xml_parser_print(SCM smob, SCM port, scm_print_state *pstate)
         scm_puts("#<XML_Parser>", port);
         /* FIXME: show more details */
         return 1;
 }
 
 static void
-gamma_xml_parser_init()
+gamma_xml_parser_init(void)
 {
          gamma_xml_parser_tag =
                  scm_make_smob_type("XML_Parser",
                                     sizeof(struct gamma_xml_parser));
          scm_set_smob_mark(gamma_xml_parser_tag, gamma_xml_parser_mark);
          scm_set_smob_free(gamma_xml_parser_tag, gamma_xml_parser_free);
          scm_set_smob_print(gamma_xml_parser_tag, gamma_xml_parser_print);
 }
 
 
 static struct gamma_expat_user_data *
-make_user_data ()
+make_user_data(void)
 {
         int i;
         
         struct gamma_expat_user_data *p = scm_malloc(sizeof (*p));
         for (i = 0; i < gamma_expat_handler_count; i++)
                 p->handler[i] = SCM_UNSPECIFIED;
@@ -150,13 +150,13 @@ SCM_DEFINE_PUBLIC(scm_xml_primitive_make_parser, "xml-primitive-make-parser",
                 SCM_VALIDATE_CHAR(2, sep);
                 separator = SCM_CHAR(sep);
                 parser = XML_ParserCreateNS(encoding, separator);
         } else
                 parser = XML_ParserCreate(encoding);
         if (!parser)
-                scm_memory_error(FUNC_NAME);
+                scm_report_out_of_memory();
         XML_SetUserData(parser, make_user_data());
         free(encoding);
         return gamma_xml_parser_create(parser);
 }
 #undef FUNC_NAME
 
diff --git a/src/gsql_conn.c b/src/gsql_conn.c
index 4d53a03..64cec27 100644
--- a/src/gsql_conn.c
+++ b/src/gsql_conn.c
@@ -28,32 +28,32 @@ static struct sql_iface sql_iftab[MAX_IFACES];
 SCM_GLOBAL_SYMBOL (gamma_sql_error, "sql-error");
 
 static long sql_connect_tag = -1;
 
 /* SMOB functions: */
 static SCM
-sql_connect_mark (SCM connect_smob)
+sql_connect_mark(SCM connect_smob)
 {
         struct sql_connect *conn = (struct sql_connect *)SCM_CDR(connect_smob);
-        return sql_iftab[conn->iface].mark(conn);
+        if (sql_iftab[conn->iface].mark)
+                return sql_iftab[conn->iface].mark(conn);
 }
 
-static scm_sizet
-sql_connect_free (SCM connect_smob)
+static size_t
+sql_connect_free(SCM connect_smob)
 {
-        scm_sizet size = sizeof(struct sql_connect);
         struct sql_connect *conn = (struct sql_connect *)SCM_CDR(connect_smob);
-        size += sql_iftab[conn->iface].free(conn);
+        sql_iftab[conn->iface].free(conn);
         if (conn->hostname)
                 free(conn->hostname);
         if (conn->username)
                 free(conn->username);
         if (conn->database)
                 free(conn->database);
         scm_gc_free(conn, sizeof *conn, "SQL connection");
-        return size;
+        return 0;
 }
 
 static int
 sql_connect_print (SCM connect_smob, SCM port, scm_print_state * pstate)
 {
         struct sql_connect *conn = (struct sql_connect *)SCM_CDR(connect_smob);
@@ -85,31 +85,31 @@ sql_find_iface(const char *name)
                 if (strcmp(sql_iftab[iface].name, name) == 0)
                         return iface;
         return -1;
 }
 
 SCM
-sql_connect_create (char *name)
+sql_connect_create(char *name)
 {
         struct sql_connect *conn;
         int iface = sql_find_iface(name);
         if (iface < 0) 
                 scm_misc_error("sql_connect_create",
                                "Unknown SQL interface ~S",
                                scm_list_1(scm_from_locale_string(name)));
         
-        conn = scm_gc_malloc (sizeof (*conn), "sql_connect");
+        conn = scm_gc_malloc(sizeof (*conn), "sql_connect");
         memset(conn, 0, sizeof *conn);
         conn->iface = iface;
-        SCM_RETURN_NEWSMOB (sql_connect_tag, conn);
+        SCM_RETURN_NEWSMOB(sql_connect_tag, conn);
 }
 
 static int
-scm_is_sql_connect (SCM scm)
+scm_is_sql_connect(SCM scm)
 {
-        return SCM_NIMP (scm) && SCM_CAR (scm) == (SCM) sql_connect_tag;
+        return SCM_NIMP(scm) && SCM_CAR (scm) == (SCM) sql_connect_tag;
 }
 
 /* Interface */
 
 static void
 gamma_cvt_iface(SCM inval, void *outval, const char *func_name)
@@ -131,13 +131,13 @@ gamma_cvt_iface(SCM inval, void *outval, const char *func_name)
                                scm_list_2(scm_from_int(1),
                                           inval));
         *(int*)outval = iface;
 }
 
 
-SCM_DEFINE_PUBLIC (sql_open_connection, "sql-open-connection", 1, 0, 0,
+SCM_DEFINE_PUBLIC(sql_open_connection, "sql-open-connection", 1, 0, 0,
                    (SCM param),
 "Connect to a database.  Take connection parameters from @var{param}, "
 "which must be a list of conses.  In each cons, the @samp{car} contains "