macro provided by iconv.m4 (from gettext).
+Mon Mar 5 20:55:49 CET 2007 John Darrington <john@darrington.wattle.id.au>
+
+ * i18n.c: Cast second argument of iconv using ICONV_CONST
+
2007-02-22 Ben Pfaff <blp@gnu.org>
* string.h: Don't include vsnprintf.h any more, because gnulib has
2007-02-22 Ben Pfaff <blp@gnu.org>
* string.h: Don't include vsnprintf.h any more, because gnulib has
The returned string must be freed when no longer required.
*/
char *
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;
{
char *outbuf = 0;
size_t outbufferlength;
if ( length == -1 )
length = strlen(text);
if ( length == -1 )
length = strlen(text);
if (convertor[how] == (iconv_t) -1)
return xstrndup (text, length);
if (convertor[how] == (iconv_t) -1)
return xstrndup (text, length);
- result = iconv(convertor[how], &text, &inbytes,
+ result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
if ( -1 == result )
{
int the_error = errno;
&op, &outbytes);
if ( -1 == result )
{
int the_error = errno;
{
case EILSEQ:
case EINVAL:
{
case EILSEQ:
case EINVAL:
}
/* Fall through */
case E2BIG:
}
/* Fall through */
case E2BIG:
- outbuf = xmalloc(outbufferlength);
+ outbuf = xmalloc (outbufferlength);
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
/* should never happen */
break;
}
/* should never happen */
break;
}
}
} while ( -1 == result );
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
}
} while ( -1 == result );
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
- outbuf = xrealloc(outbuf, outbufferlength + 1);
+ outbuf = xrealloc (outbuf, outbufferlength + 1);
op += (outbuf - oldaddr) ;
}
op += (outbuf - oldaddr) ;
}
/* Returns the current PSPP locale */
const char *
/* Returns the current PSPP locale */
const char *
return locale;
}
/* Set the PSPP locale */
void
return locale;
}
/* Set the PSPP locale */
void
-set_pspp_locale(const char *l)
+set_pspp_locale (const char *l)
{
char *current_locale;
const char *current_charset;
{
char *current_locale;
const char *current_charset;
free(locale);
locale = strdup(l);
free(locale);
locale = strdup(l);
- current_locale = setlocale(LC_CTYPE, 0);
- current_charset = locale_charset();
- setlocale(LC_CTYPE, locale);
+ current_locale = setlocale (LC_CTYPE, 0);
+ current_charset = locale_charset ();
+ setlocale (LC_CTYPE, locale);
- charset = locale_charset();
- setlocale(LC_CTYPE, current_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);
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
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
}
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);
convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
locale = 0;
for(i = 0 ; i < n_CONV; ++i )
{
if ( (iconv_t) -1 == convertor[i] )
continue;
locale = 0;
for(i = 0 ; i < n_CONV; ++i )
{
if ( (iconv_t) -1 == convertor[i] )
continue;
- iconv_close(convertor[i]);
+ iconv_close (convertor[i]);