Fix warnings.

[pspp-builds.git] / src / libpspp / i18n.c

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index a2c0af0f94e8f5a6d0188a16c994c131fe02605d..43056c8b7431b7e7f22da99c11d459380b411880 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <iconv.h>
 #include <errno.h>
+#include "assertion.h"
 
 #include "i18n.h"
 
@@ -39,21 +40,21 @@ static iconv_t convertor[n_CONV];
 
 
 /* A wrapper around iconv_open */
-static iconv_t 
+static iconv_t
 create_iconv (const char* tocode, const char* fromcode)
 {
   iconv_t conv = iconv_open (tocode, fromcode);
 
   /* 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 == conv) 
+  if ( (iconv_t) -1 == conv)
     {
       const int err = errno;
-      fprintf (stderr, 
+      fprintf (stderr,
        "Warning: cannot create a convertor for \"%s\" to \"%s\": %s\n",
        fromcode, tocode, strerror (err));
     }
-   
+
   return conv;
 }
 
@@ -62,7 +63,7 @@ create_iconv (const char* tocode, const char* fromcode)
    The returned string must be freed when no longer required.
 */
 char *
-recode_string(enum conv_id how,  const char *text, int length)
+recode_string (enum conv_id how,  const char *text, int length)
 {
   char *outbuf = 0;
   size_t outbufferlength;
@@ -74,19 +75,19 @@ recode_string(enum conv_id how,  const char *text, int length)
   /* FIXME: Need to ensure that this char is valid in the target encoding */
   const char fallbackchar = '?';
 
-  if ( text == NULL ) 
+  if ( text == NULL )
     return NULL;
 
-  if ( length == -1 ) 
+  if ( length == -1 )
      length = strlen(text);
 
-  assert(how < n_CONV);
+  assert (how < n_CONV);
 
-  if (convertor[how] == (iconv_t) -1) 
+  if (convertor[how] == (iconv_t) -1)
     return xstrndup (text, length);
 
   for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
-    if ( outbufferlength > length) 
+    if ( outbufferlength > length)
       break;
 
   outbuf = xmalloc(outbufferlength);
@@ -94,20 +95,21 @@ recode_string(enum conv_id how,  const char *text, int length)
 
   outbytes = outbufferlength;
   inbytes = length;
-  
+
   do {
-    result = iconv(convertor[how], &text, &inbytes, 
+    const char *ip = text;
+    result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
                   &op, &outbytes);
 
-    if ( -1 == result ) 
+    if ( -1 == result )
       {
        int the_error = errno;
 
-       switch ( the_error)
+       switch (the_error)
          {
          case EILSEQ:
          case EINVAL:
-           if ( outbytes > 0 ) 
+           if ( outbytes > 0 )
              {
                *op++ = fallbackchar;
                outbytes--;
@@ -117,26 +119,27 @@ recode_string(enum conv_id how,  const char *text, int length)
              }
            /* Fall through */
          case E2BIG:
-           free(outbuf);
+           free (outbuf);
            outbufferlength <<= 1;
-           outbuf = xmalloc(outbufferlength);
+           outbuf = xmalloc (outbufferlength);
            op = outbuf;
            outbytes = outbufferlength;
            inbytes = length;
+           text = ip;
            break;
          default:
            /* should never happen */
+           NOT_REACHED ();
            break;
          }
-
       }
   } while ( -1 == result );
 
-  if (outbytes == 0 ) 
+  if (outbytes == 0 )
     {
       char *const oldaddr = outbuf;
-      outbuf = xrealloc(outbuf, outbufferlength + 1);
-      
+      outbuf = xrealloc (outbuf, outbufferlength + 1);
+
       op += (outbuf - oldaddr) ;
     }
 
@@ -148,15 +151,15 @@ recode_string(enum conv_id how,  const char *text, int length)
 
 /* Returns the current PSPP locale */
 const char *
-get_pspp_locale(void)
+get_pspp_locale (void)
 {
-  assert ( locale);
+  assert (locale);
   return locale;
 }
 
 /* Set the PSPP locale */
-void 
-set_pspp_locale(const char *l)
+void
+set_pspp_locale (const char *l)
 {
   char *current_locale;
   const char *current_charset;
@@ -164,46 +167,46 @@ set_pspp_locale(const char *l)
   free(locale);
   locale = strdup(l);
 
-  current_locale = setlocale(LC_CTYPE, 0);
-  current_charset = locale_charset();
-  setlocale(LC_CTYPE, locale);
-  
-  charset = locale_charset();
-  setlocale(LC_CTYPE, current_locale);
+  current_locale = setlocale (LC_CTYPE, 0);
+  current_charset = locale_charset ();
+  setlocale (LC_CTYPE, locale);
+
+  charset = locale_charset ();
+  setlocale (LC_CTYPE, current_locale);
 
-  iconv_close(convertor[CONV_PSPP_TO_UTF8]);
+  iconv_close (convertor[CONV_PSPP_TO_UTF8]);
   convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
 
-  iconv_close(convertor[CONV_SYSTEM_TO_PSPP]);
+  iconv_close (convertor[CONV_SYSTEM_TO_PSPP]);
   convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
 }
 
 void
-i18n_init(void)
+i18n_init (void)
 {
-  assert ( ! locale) ;
-  locale = strdup(setlocale(LC_CTYPE, NULL));
+  assert (!locale) ;
+  locale = strdup (setlocale (LC_CTYPE, NULL));
 
-  setlocale(LC_CTYPE, locale);
-  charset = locale_charset();
+  setlocale (LC_CTYPE, locale);
+  charset = locale_charset ();
 
   convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
   convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
 }
 
 
-void 
-i18n_done(void)
+void
+i18n_done (void)
 {
   int i;
-  free(locale);
+  free (locale);
   locale = 0;
 
-  for(i = 0 ; i < n_CONV; ++i ) 
+  for(i = 0 ; i < n_CONV; ++i )
     {
-      if ( (iconv_t) -1 == convertor[i] ) 
+      if ( (iconv_t) -1 == convertor[i] )
        continue;
-      iconv_close(convertor[i]);
+      iconv_close (convertor[i]);
     }
 }