diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-15 22:13:14 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-15 22:13:14 +0200 |
commit | 5c3643f95a9d5568b64875ddf96a7e007050de72 (patch) | |
tree | ef0b514e194dfdc4257040b8f2554df8f081895e /src | |
parent | 7c6a94930dae634efd8af6db16578d8317153a9a (diff) | |
download | gamma-5c3643f95a9d5568b64875ddf96a7e007050de72.tar.gz gamma-5c3643f95a9d5568b64875ddf96a7e007050de72.tar.bz2 |
Use scm_from_locale_string instead of scm_makfrom0str.
Diffstat (limited to 'src')
-rw-r--r-- | src/gamma-expat.c | 12 | ||||
-rw-r--r-- | src/gsql_conn.c | 2 | ||||
-rw-r--r-- | src/gsql_lib.c | 4 | ||||
-rw-r--r-- | src/mysql.c | 2 | ||||
-rw-r--r-- | src/pgsql.c | 12 | ||||
-rw-r--r-- | src/syslog.c | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/gamma-expat.c b/src/gamma-expat.c index 3348d65..c606273 100644 --- a/src/gamma-expat.c +++ b/src/gamma-expat.c @@ -163,7 +163,7 @@ SCM_DEFINE(scm_xml_set_encoding, "xml-set-encoding", 2, 0, 0, enum XML_Error error = XML_GetErrorCode(gp->parser); scm_error(gamma_xml_error, FUNC_NAME, "~A", - scm_list_1(scm_makfrom0str(XML_ErrorString(error))), + scm_list_1(scm_from_locale_string(XML_ErrorString(error))), SCM_BOOL_F); } return SCM_UNSPECIFIED; @@ -193,7 +193,7 @@ SCM_DEFINE(scm_xml_primitive_parse, "xml-primitive-parse", 3, 0, 0, enum XML_Error error = XML_GetErrorCode(gp->parser); scm_error(gamma_xml_error, FUNC_NAME, "~A", - scm_list_1(scm_makfrom0str(XML_ErrorString(error))), + scm_list_1(scm_from_locale_string(XML_ErrorString(error))), scm_list_2(scm_from_int(error), input)); } return SCM_UNSPECIFIED; @@ -209,8 +209,8 @@ attrs_to_scm(const XML_Char **attr) SCM scm_first = SCM_EOL, scm_last = SCM_EOL; for (i = 0; attr[i]; i += 2) { - SCM new = scm_cons(scm_cons(scm_makfrom0str(attr[i]), - scm_makfrom0str(attr[i + 1])), + SCM new = scm_cons(scm_cons(scm_from_locale_string(attr[i]), + scm_from_locale_string(attr[i + 1])), SCM_EOL); if (scm_first == SCM_EOL) scm_last = scm_first = new; @@ -245,7 +245,7 @@ generic_start_handler(void *user_data, const XML_Char *name, struct gamma_expat_user_data *udata = user_data; xdata.proc = udata->handler[start_element_handler]; - xdata.arg = scm_list_2(scm_makfrom0str(name), + xdata.arg = scm_list_2(scm_from_locale_string(name), attrs_to_scm(attrs)); gamma_safe_exec(gamma_apply_catch_body, &xdata, NULL); } @@ -263,7 +263,7 @@ generic_end_handler(void *user_data, const XML_Char *name) struct gamma_expat_user_data *udata = user_data; xdata.proc = udata->handler[end_element_handler]; - xdata.arg = scm_list_1(scm_makfrom0str(name)); + xdata.arg = scm_list_1(scm_from_locale_string(name)); gamma_safe_exec(gamma_apply_catch_body, &xdata, NULL); } diff --git a/src/gsql_conn.c b/src/gsql_conn.c index 40fef2b..7b3ca5c 100644 --- a/src/gsql_conn.c +++ b/src/gsql_conn.c @@ -95,7 +95,7 @@ sql_connect_create (char *name) if (iface < 0) scm_misc_error("sql_connect_create", "Unknown SQL interface ~S", - scm_list_1(scm_makfrom0str(name))); + scm_list_1(scm_from_locale_string(name))); conn = scm_gc_malloc (sizeof (*conn), "sql_connect"); memset(conn, 0, sizeof *conn); diff --git a/src/gsql_lib.c b/src/gsql_lib.c index 72ce17a..7972595 100644 --- a/src/gsql_lib.c +++ b/src/gsql_lib.c @@ -58,8 +58,8 @@ gamma_parmlist_parse(SCM parmlist, struct gamma_parmdcl *dcltab, if (flags & GAMMA_PARMLIST_WARN_UNKNOWN) { scm_simple_format (scm_current_error_port (), - scm_makfrom0str("~S: undefined keyword: ~S~%"), - scm_list_2(scm_makfrom0str(func_name), + scm_from_locale_string("~S: undefined keyword: ~S~%"), + scm_list_2(scm_from_locale_string(func_name), kw)); continue; } diff --git a/src/mysql.c b/src/mysql.c index 4b4d0f2..08b4ab8 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -165,7 +165,7 @@ s_mysql_query(struct sql_connect *conn, const char *query) if (!row) break; for (j = 0; j < nfields; j++) { - SCM new_elt = scm_cons(scm_makfrom0str(row[j]), + SCM new_elt = scm_cons(scm_from_locale_string(row[j]), SCM_EOL); if (head == SCM_EOL) head = new_elt; diff --git a/src/pgsql.c b/src/pgsql.c index 759795e..7fceacd 100644 --- a/src/pgsql.c +++ b/src/pgsql.c @@ -71,8 +71,8 @@ s_pgsql_connect (SCM parmlist, const char *func_name) free(user); free(pass); - pmsg = scm_makfrom0str(PQerrorMessage(pgconn)); - args = scm_list_1(scm_makfrom0str("Cannot connect to the database")); + pmsg = scm_from_locale_string(PQerrorMessage(pgconn)); + args = scm_list_1(scm_from_locale_string("Cannot connect to the database")); PQfinish(pgconn); scm_error(gamma_sql_error, func_name, "~A", @@ -104,7 +104,7 @@ result_to_list(PGresult *res) for (j = 0; j < nfields; j++) { char *val = PQgetvalue(res, i, j); - SCM new_elt = scm_cons(scm_makfrom0str(val), SCM_EOL); + SCM new_elt = scm_cons(scm_from_locale_string(val), SCM_EOL); if (head == SCM_EOL) head = new_elt; else @@ -135,9 +135,9 @@ s_pgsql_query(struct sql_connect *conn, const char *query) if (!res) scm_error(gamma_sql_error, "sql-query", "~A", - scm_list_1(scm_makfrom0str("Error executing PostgreSQL query")), + scm_list_1(scm_from_locale_string("Error executing PostgreSQL query")), scm_list_2(SCM_BOOL_F, - scm_makfrom0str(PQerrorMessage(pgconn)))); + scm_from_locale_string(PQerrorMessage(pgconn)))); stat = PQresultStatus(res); @@ -154,7 +154,7 @@ s_pgsql_query(struct sql_connect *conn, const char *query) default: scm_error(gamma_sql_error, "sql-query", "~A", - scm_list_1(scm_makfrom0str("PostgreSQL error")), + scm_list_1(scm_from_locale_string("PostgreSQL error")), scm_list_2(scm_from_uint(stat), scm_from_locale_string(PQresStatus(stat)))); } diff --git a/src/syslog.c b/src/syslog.c index b50762f..e588fb2 100644 --- a/src/syslog.c +++ b/src/syslog.c @@ -58,7 +58,7 @@ SCM_DEFINE(scm_syslog_tag, "syslog-tag", 0, 0, 0, scm_misc_error("syslog-tag", "openlog have not been called", SCM_EOL); - return scm_makfrom0str(log_tag); + return scm_from_locale_string(log_tag); } #undef FUNC_NAME |