diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-06 18:11:20 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-06 18:11:20 +0200 |
commit | d68261197e99fe472e0d75cefd30db4c4e43775e (patch) | |
tree | cadf600fc0fa195b1fe369d319a496e2cdbbf95c | |
parent | 68015bc90675e797d2d0269a6581da0cc497f7e7 (diff) | |
download | gamma-d68261197e99fe472e0d75cefd30db4c4e43775e.tar.gz gamma-d68261197e99fe472e0d75cefd30db4c4e43775e.tar.bz2 |
Remove uses of scm_i_ functions.
* src/gsql_lib.c (scm_makenum): Remove.
* src/guile-sql.h (scm_makenum): Remove.
* src/mysql.c, src/pgsql.c: Use scm_to_ulong
instead of scm_makenum.
-rw-r--r-- | src/gsql_lib.c | 19 | ||||
-rw-r--r-- | src/guile-sql.h | 1 | ||||
-rw-r--r-- | src/mysql.c | 2 | ||||
-rw-r--r-- | src/pgsql.c | 2 |
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 | |||
@@ -20,25 +20,6 @@ | |||
20 | #include <guile-sql.h> | 20 | #include <guile-sql.h> |
21 | #include <app.h> | 21 | #include <app.h> |
22 | 22 | ||
23 | SCM | ||
24 | scm_makenum (unsigned long val) | ||
25 | #ifndef HAVE_SCM_LONG2NUM | ||
26 | { | ||
27 | if (SCM_FIXABLE ((long) val)) | ||
28 | return scm_from_int (val); | ||
29 | |||
30 | #ifdef SCM_BIGDIG | ||
31 | return scm_i_long2big (val); | ||
32 | #else /* SCM_BIGDIG */ | ||
33 | return scm_make_real ((double) val); | ||
34 | #endif /* SCM_BIGDIG */ | ||
35 | } | ||
36 | #else | ||
37 | { | ||
38 | return scm_long2num (val); | ||
39 | } | ||
40 | #endif | ||
41 | |||
42 | static struct gamma_parmdcl * | 23 | static struct gamma_parmdcl * |
43 | find_parmdcl(struct gamma_parmdcl *dcl, const char *name) | 24 | find_parmdcl(struct gamma_parmdcl *dcl, const char *name) |
44 | { | 25 | { |
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 | |||
@@ -57,7 +57,6 @@ struct gamma_parmdcl { | |||
57 | #define GAMMA_PARMLIST_WARN_UNKNOWN 0x0002 | 57 | #define GAMMA_PARMLIST_WARN_UNKNOWN 0x0002 |
58 | 58 | ||
59 | SCM sql_connect_create(char *name); | 59 | SCM sql_connect_create(char *name); |
60 | SCM scm_makenum(unsigned long val); | ||
61 | 60 | ||
62 | void gamma_parmlist_parse(SCM parmlist, | 61 | void gamma_parmlist_parse(SCM parmlist, |
63 | struct gamma_parmdcl *dcltab, int flags, | 62 | struct gamma_parmdcl *dcltab, int flags, |
diff --git a/src/mysql.c b/src/mysql.c index f4e178f..2499154 100644 --- a/src/mysql.c +++ b/src/mysql.c | |||
@@ -172,7 +172,7 @@ s_mysql_query(struct sql_connect *conn, const char *query) | |||
172 | mysql_free_result(result); | 172 | mysql_free_result(result); |
173 | } else { /* should it have returned something? */ | 173 | } else { /* should it have returned something? */ |
174 | if (mysql_field_count(mysql) == 0) { | 174 | if (mysql_field_count(mysql) == 0) { |
175 | cell = scm_makenum(mysql_affected_rows(mysql)); | 175 | cell = scm_to_ulong(mysql_affected_rows(mysql)); |
176 | } else { /* mysql_store_result() should have returned data */ | 176 | } else { /* mysql_store_result() should have returned data */ |
177 | scm_throw(gsql_error, | 177 | scm_throw(gsql_error, |
178 | scm_list_2(scm_makfrom0str("Query should have returned data"), | 178 | scm_list_2(scm_makfrom0str("Query should have returned data"), |
diff --git a/src/pgsql.c b/src/pgsql.c index 2a7fe23..c1a8e41 100644 --- a/src/pgsql.c +++ b/src/pgsql.c | |||
@@ -137,7 +137,7 @@ s_pgsql_query(struct sql_connect *conn, const char *query) | |||
137 | switch (stat) { | 137 | switch (stat) { |
138 | case PGRES_COMMAND_OK: | 138 | case PGRES_COMMAND_OK: |
139 | /* Successful completion of a command returning no data */ | 139 | /* Successful completion of a command returning no data */ |
140 | cell = scm_makenum(strtoul(PQcmdTuples(res), NULL, 0)); | 140 | cell = scm_to_ulong(strtoul(PQcmdTuples(res), NULL, 0)); |
141 | break; | 141 | break; |
142 | case PGRES_TUPLES_OK: | 142 | case PGRES_TUPLES_OK: |
143 | /* The query successfully executed */ | 143 | /* The query successfully executed */ |