mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00
Code Activity

* print.c (scm_simple_format): Bugfix: Coerce port before using it.

Browse source
This commit is contained in:
Mikael Djurfeldt 2000-08-02 06:00:09 +00:00
parent cdaf0a20af
commit daba1a710d
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/print.c
View file

@ -960,18 +960,24 @@ SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
char *start;
char *p;
if (SCM_EQ_P (destination, SCM_BOOL_T)) {
destination = scm_cur_outp;
} else if (SCM_FALSEP (destination)) {
fReturnString = 1;
destination = scm_mkstrport (SCM_INUM0,
scm_make_string (SCM_INUM0, SCM_UNDEFINED),
SCM_OPN | SCM_WRTNG,
FUNC_NAME);
} else {
SCM_VALIDATE_OPORT_VALUE (1,destination);
}
SCM_VALIDATE_STRING(2,message);
if (SCM_EQ_P (destination, SCM_BOOL_T))
{
destination = scm_cur_outp;
}
else if (SCM_FALSEP (destination))
{
fReturnString = 1;
destination = scm_mkstrport (SCM_INUM0,
scm_make_string (SCM_INUM0, SCM_UNDEFINED),
SCM_OPN | SCM_WRTNG,
FUNC_NAME);
}
else
{
SCM_VALIDATE_OPORT_VALUE (1, destination);
destination = SCM_COERCE_OUTPORT (destination);
}
SCM_VALIDATE_STRING (2, message);
SCM_VALIDATE_REST_ARGUMENT (args);
start = SCM_ROCHARS (message);
@ -999,7 +1005,7 @@ SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
if (fReturnString)
answer = scm_strport_to_string (destination);
return scm_return_first(answer,message);
return scm_return_first (answer, message);
}
#undef FUNC_NAME