Update some comments

diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c
index 1a82ef3f1bf61bfcc6ce1e9a2559237f37fcc37d..39ecedd133eec1c7aa54475df35ee2b5efb3cde1 100644 (file)
--- 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 fb3973f437bb737d0ba53011596da1f844588509..64aa005612627bbc223b155abc5075e8c32e9186 100644 (file)
--- 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))