projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings about casts between pointers and differently sized integers.
[pspp]
/
src
/
libpspp
/
u8-istream.c
diff --git
a/src/libpspp/u8-istream.c
b/src/libpspp/u8-istream.c
index 22135dbb3381f08ed3f3c70440df99b1d1521dcb..2486ca1ada31c53966e556dfc9932f4ace47a3be 100644
(file)
--- a/
src/libpspp/u8-istream.c
+++ b/
src/libpspp/u8-istream.c
@@
-134,12
+134,14
@@
u8_istream_for_fd (const char *fromcode, int fd)
{
if (encoding_guess_encoding_is_auto (fromcode)
&& !strcmp (encoding, "ASCII"))
{
if (encoding_guess_encoding_is_auto (fromcode)
&& !strcmp (encoding, "ASCII"))
- is->state = S_AUTO;
+ {
+ is->state = S_AUTO;
+ encoding = encoding_guess_parse_encoding (fromcode);
+ }
else
is->state = S_CONVERT;
else
is->state = S_CONVERT;
- is->converter = iconv_open ("UTF-8",
- encoding_guess_parse_encoding (fromcode));
+ is->converter = iconv_open ("UTF-8", encoding);
if (is->converter == (iconv_t) -1)
goto error;
}
if (is->converter == (iconv_t) -1)
goto error;
}