summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/gsql_lib.c19
-rw-r--r--src/guile-sql.h1
-rw-r--r--src/mysql.c2
-rw-r--r--src/pgsql.c2
4 files changed, 2 insertions, 22 deletions
diff --git a/src/gsql_lib.c b/src/gsql_lib.c
index 223b223..be2e15f 100644
--- a/src/gsql_lib.c
+++ b/src/gsql_lib.c
@@ -17,31 +17,12 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <guile-sql.h>
#include <app.h>
-SCM
-scm_makenum (unsigned long val)
-#ifndef HAVE_SCM_LONG2NUM
-{
- if (SCM_FIXABLE ((long) val))
- return scm_from_int (val);
-
-#ifdef SCM_BIGDIG
- return scm_i_long2big (val);
-#else /* SCM_BIGDIG */
- return scm_make_real ((double) val);
-#endif /* SCM_BIGDIG */
-}
-#else
-{
- return scm_long2num (val);
-}
-#endif
-
static struct gamma_parmdcl *
find_parmdcl(struct gamma_parmdcl *dcl, const char *name)
{
for (; dcl->name; dcl++)
if (strcmp(dcl->name, name) == 0)
return dcl;
diff --git a/src/guile-sql.h b/src/guile-sql.h
index 1956395..e66ffcb 100644
--- a/src/guile-sql.h
+++ b/src/guile-sql.h
@@ -54,13 +54,12 @@ struct gamma_parmdcl {
};
#define GAMMA_PARMLIST_IGNORE_UNKNOWN 0x0001
#define GAMMA_PARMLIST_WARN_UNKNOWN 0x0002
SCM sql_connect_create(char *name);
-SCM scm_makenum(unsigned long val);
void gamma_parmlist_parse(SCM parmlist,
struct gamma_parmdcl *dcltab, int flags,
const char *func_name);
void gamma_cvt_string(SCM inval, void *outval, const char *func_name);
void gamma_cvt_int(SCM inval, void *outval, const char *func_name);
diff --git a/src/mysql.c b/src/mysql.c
index f4e178f..2499154 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -169,13 +169,13 @@ s_mysql_query(struct sql_connect *conn, const char *query)
row_tail = new_row;
}
cell = row_head;
mysql_free_result(result);
} else { /* should it have returned something? */
if (mysql_field_count(mysql) == 0) {
- cell = scm_makenum(mysql_affected_rows(mysql));
+ cell = scm_to_ulong(mysql_affected_rows(mysql));
} else { /* mysql_store_result() should have returned data */
scm_throw(gsql_error,
scm_list_2(scm_makfrom0str("Query should have returned data"),
scm_makfrom0str(mysql_error(mysql))));
}
}
diff --git a/src/pgsql.c b/src/pgsql.c
index 2a7fe23..c1a8e41 100644
--- a/src/pgsql.c
+++ b/src/pgsql.c
@@ -134,13 +134,13 @@ s_pgsql_query(struct sql_connect *conn, const char *query)
stat = PQresultStatus(res);
switch (stat) {
case PGRES_COMMAND_OK:
/* Successful completion of a command returning no data */
- cell = scm_makenum(strtoul(PQcmdTuples(res), NULL, 0));
+ cell = scm_to_ulong(strtoul(PQcmdTuples(res), NULL, 0));
break;
case PGRES_TUPLES_OK:
/* The query successfully executed */
cell = result_to_list(res);
PQclear(res);
break;

Return to:

Send suggestions and report system problems to the System administrator.