projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(close): Rename to do_close to avoid conflict with POSIX function of
[pspp]
/
src
/
libpspp
/
i18n.c
diff --git
a/src/libpspp/i18n.c
b/src/libpspp/i18n.c
index ffaa40489b042c7460480a0989bd6730a37c5e9b..23254ea3bb0a705381e87d5ff2124c84fd5e4223 100644
(file)
--- a/
src/libpspp/i18n.c
+++ b/
src/libpspp/i18n.c
@@
-62,12
+62,11
@@
create_iconv (const char* tocode, const char* fromcode)
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;
size_t result;
{
char *outbuf = 0;
size_t outbufferlength;
size_t result;
- char *ip ;
char *op ;
size_t inbytes = 0;
size_t outbytes ;
char *op ;
size_t inbytes = 0;
size_t outbytes ;
@@
-81,7
+80,7
@@
recode_string(enum conv_id how, const char *text, int length)
if ( length == -1 )
length = strlen(text);
if ( length == -1 )
length = strlen(text);
- assert(how < n_CONV);
+ assert
(how < n_CONV);
if (convertor[how] == (iconv_t) -1)
return xstrndup (text, length);
if (convertor[how] == (iconv_t) -1)
return xstrndup (text, length);
@@
-92,20
+91,19
@@
recode_string(enum conv_id how, const char *text, int length)
outbuf = xmalloc(outbufferlength);
op = outbuf;
outbuf = xmalloc(outbufferlength);
op = outbuf;
- ip = (char *) text;
outbytes = outbufferlength;
inbytes = length;
do {
outbytes = outbufferlength;
inbytes = length;
do {
- result = iconv
(convertor[how], &ip
, &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;
- switch (
the_error)
+ switch (the_error)
{
case EILSEQ:
case EINVAL:
{
case EILSEQ:
case EINVAL:
@@
-113,17
+111,16
@@
recode_string(enum conv_id how, const char *text, int length)
{
*op++ = fallbackchar;
outbytes--;
{
*op++ = fallbackchar;
outbytes--;
-
ip
++;
+
text
++;
inbytes--;
break;
}
/* Fall through */
case E2BIG:
inbytes--;
break;
}
/* Fall through */
case E2BIG:
- free(outbuf);
+ free
(outbuf);
outbufferlength <<= 1;
outbufferlength <<= 1;
- outbuf = xmalloc(outbufferlength);
+ outbuf = xmalloc
(outbufferlength);
op = outbuf;
op = outbuf;
- ip = (char *) text;
outbytes = outbufferlength;
inbytes = length;
break;
outbytes = outbufferlength;
inbytes = length;
break;
@@
-131,14
+128,13
@@
recode_string(enum conv_id how, const char *text, int 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) ;
}
@@
-151,15
+147,15
@@
recode_string(enum conv_id how, const char *text, int length)
/* Returns the current PSPP locale */
const char *
/* 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
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;
@@
-167,28
+163,28
@@
set_pspp_locale(const char *l)
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
-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);
convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
@@
-196,17
+192,17
@@
i18n_init(void)
void
void
-i18n_done(void)
+i18n_done
(void)
{
int i;
{
int i;
- free(locale);
+ free
(locale);
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]);
}
}
}
}