projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temp-file: Use 64 kB buffer for temporary files.
[pspp-builds.git]
/
src
/
libpspp
/
i18n.c
diff --git
a/src/libpspp/i18n.c
b/src/libpspp/i18n.c
index 0e461db160dc5f69fcc65fcba1284192e1c44758..688a0c878d3299d1f9a9d729097b5024fff667ca 100644
(file)
--- a/
src/libpspp/i18n.c
+++ b/
src/libpspp/i18n.c
@@
-283,7
+283,7
@@
utf8_encoding_concat__ (const char *head, size_t head_len,
else
{
size_t copy_len;
else
{
size_t copy_len;
-
size
_t prev;
+
ucs4
_t prev;
size_t ofs;
int mblen;
size_t ofs;
int mblen;
@@
-324,7
+324,7
@@
utf8_encoding_concat__ (const char *head, size_t head_len,
{
bool correct_result = false;
size_t copy_len;
{
bool correct_result = false;
size_t copy_len;
-
size
_t prev;
+
ucs4
_t prev;
size_t ofs;
int mblen;
size_t ofs;
int mblen;
@@
-609,7
+609,8
@@
i18n_done (void)
{
free (cvtr->tocode);
free (cvtr->fromcode);
{
free (cvtr->tocode);
free (cvtr->fromcode);
- iconv_close (cvtr->conv);
+ if (cvtr->conv != (iconv_t) -1)
+ iconv_close (cvtr->conv);
free (cvtr);
}
free (cvtr);
}