mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

(scm_input_error): Use a SCM value for 'fn', not a C string. This

Browse source 
avoids a conversion round-trip.
This commit is contained in:
Marius Vollmer 2004-08-10 13:54:01 +00:00
parent 79c98b33fe
commit 29a837fd27
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libguile/read.c
View file

@ -76,22 +76,21 @@ scm_t_option scm_read_opts[] = {
static void static void
scm_input_error(char const * function, scm_input_error (char const *function,
SCM port, const char * message, SCM arg) SCM port, const char *message, SCM arg)
{ {
char *fn = SCM_STRINGP (SCM_FILENAME(port)) SCM fn = (scm_is_string (SCM_FILENAME(port))
? SCM_STRING_CHARS(SCM_FILENAME(port)) ? SCM_FILENAME(port)
: "#<unknown port>"; : scm_from_locale_string ("#<unknown port>"));
SCM string_port = scm_open_output_string (); SCM string_port = scm_open_output_string ();
SCM string = SCM_EOL; SCM string = SCM_EOL;
scm_simple_format (string_port, scm_simple_format (string_port,
scm_makfrom0str ("~A:~S:~S: ~A"), scm_makfrom0str ("~A:~S:~S: ~A"),
scm_list_4 (scm_makfrom0str (fn), scm_list_4 (fn,
scm_from_int (SCM_LINUM (port) + 1), scm_from_int (SCM_LINUM (port) + 1),
scm_from_int (SCM_COL (port) + 1), scm_from_int (SCM_COL (port) + 1),
scm_makfrom0str (message))); scm_makfrom0str (message)));
string = scm_get_output_string (string_port); string = scm_get_output_string (string_port);
scm_close_output_port (string_port); scm_close_output_port (string_port);