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

Remove useless branches in the port code.

Browse source 
* libguile/ports.c (scm_i_get_port_encoding): Remove useless `if'.
  (scm_set_port_encoding_x): Remove redundant `find_valid_encoding'
  call.
This commit is contained in:
Ludovic Courtès 2011-01-24 23:13:03 +01:00
parent d9544bf012
commit da288f50bf
1 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/ports.c
View file

@ -1977,10 +1977,7 @@ scm_i_get_port_encoding (SCM port)
{ {
scm_t_port *pt; scm_t_port *pt;
pt = SCM_PTAB_ENTRY (port); pt = SCM_PTAB_ENTRY (port);
if (pt->encoding)
return pt->encoding; return pt->encoding;
else
return NULL;
} }
} }
@ -2131,24 +2128,13 @@ SCM_DEFINE (scm_set_port_encoding_x, "set-port-encoding!", 2, 0, 0,
#define FUNC_NAME s_scm_set_port_encoding_x #define FUNC_NAME s_scm_set_port_encoding_x
{ {
char *enc_str; char *enc_str;
const char *valid_enc_str;
SCM_VALIDATE_PORT (1, port); SCM_VALIDATE_PORT (1, port);
SCM_VALIDATE_STRING (2, enc); SCM_VALIDATE_STRING (2, enc);
enc_str = scm_to_locale_string (enc); enc_str = scm_to_locale_string (enc);
valid_enc_str = find_valid_encoding (enc_str); scm_i_set_port_encoding_x (port, enc_str);
if (valid_enc_str == NULL)
{
free (enc_str);
scm_misc_error (FUNC_NAME, "invalid or unknown character encoding ~s",
scm_list_1 (enc));
}
else
{
scm_i_set_port_encoding_x (port, valid_enc_str);
free (enc_str);
}
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
#undef FUNC_NAME #undef FUNC_NAME