mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-28 16:00:22 +02:00
Code Activity

scm_from_stringn and scm_to_stringn encoding args are never NULL

Browse source 
* libguile/strings.c (scm_from_stringn, scm_to_stringn): Encoding
  argument cannot be NULL.  Instead check that the encoding was
  ISO-8859-1.
This commit is contained in:
Andy Wingo 2013-01-15 15:06:37 +01:00
parent d1b9f8ace9
commit b39685c6da
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/strings.c
View file

@ -1524,7 +1524,7 @@ scm_from_stringn (const char *str, size_t len, const char *encoding,
if (len == (size_t) -1) if (len == (size_t) -1)
len = strlen (str); len = strlen (str);
if (encoding == NULL || len == 0) if (strcmp (encoding, "ISO-8859-1") == 0 || len == 0)
return scm_from_latin1_stringn (str, len); return scm_from_latin1_stringn (str, len);
else if (strcmp (encoding, "UTF-8") == 0 else if (strcmp (encoding, "UTF-8") == 0
&& handler == SCM_FAILED_CONVERSION_ERROR) && handler == SCM_FAILED_CONVERSION_ERROR)
@ -2170,7 +2170,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding,
"string contains #\\nul character: ~S", "string contains #\\nul character: ~S",
scm_list_1 (str)); scm_list_1 (str));
if (scm_i_is_narrow_string (str) && (encoding == NULL)) if (scm_i_is_narrow_string (str) && strcmp (encoding, "ISO-8859-1") == 0)
{ {
/* If using native Latin-1 encoding, just copy the string /* If using native Latin-1 encoding, just copy the string
contents. */ contents. */