From d3ceb500f824c3765b424e69c69cf3eb85117d15 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 16 Apr 2009 08:02:33 +0800 Subject: [PATCH] Update some comments --- src/language/data-io/combine-files.c | 5 ++++- src/libpspp/i18n.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 1a82ef3f..39ecedd1 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -497,7 +497,10 @@ merge_dictionary (struct dictionary *const m, struct comb_file *f) m_docs = dict_get_documents (m); - /* If the input files have different encodings, then + /* FIXME: If the input files have different encodings, then + the result is undefined. + The correct thing to do would be to convert to an encoding + which can cope with all the input files (eg UTF-8). */ file_encoding = dict_get_encoding (f->dict); if ( file_encoding != NULL) diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index fb3973f4..64aa0056 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -68,7 +68,7 @@ create_iconv (const char* tocode, const char* fromcode) converter->fromcode = xstrdup (fromcode); converter->conv = iconv_open (tocode, fromcode); hmapx_insert (&map, converter, hash); - + /* I don't think it's safe to translate this string or to use messaging as the convertors have not yet been set up */ if ( (iconv_t) -1 == converter->conv && 0 != strcmp (tocode, fromcode)) -- 2.30.2