diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2009-12-17 23:04:43 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2009-12-17 23:04:43 +0300 |
| commit | bbe9636fd8db2af188f6e20bacd31225301b0aa6 (patch) | |
| tree | 78b2a7409378c603e65b8cbbfcdeeaef00fb268e /newlib | |
| parent | 8b917fbcdd82d165f1c9908d014696543767b34c (diff) | |
2009-12-17 Jerker Back <jerker.back@gmail.com>
* libc/iconv/lib/local.h[!__GNUC__]: Add alternative version of
ICONV_ZERO_MB_STATE_T macro.
* libc/iconv/lib/ucsconv.c (ucs_based_conversion_get_state): Use
temporary local variable nullstate to hold empty mbstate_t.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | newlib/libc/iconv/lib/local.h | 4 | ||||
| -rw-r--r-- | newlib/libc/iconv/lib/ucsconv.c | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index c5b258364..a216cda6f 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,5 +1,12 @@ 2009-12-17 Jerker Back <jerker.back@gmail.com> + * libc/iconv/lib/local.h[!__GNUC__]: Add alternative version of + ICONV_ZERO_MB_STATE_T macro. + * libc/iconv/lib/ucsconv.c (ucs_based_conversion_get_state): Use + temporary local variable nullstate to hold empty mbstate_t. + +2009-12-17 Jerker Back <jerker.back@gmail.com> + * libc/include/_ansi.h: Add new _EXFNPTR macro for using with function pointer arguments. * libc/iconv/lib/conv.h: Use _EXFNPTR rather than _EXPARM macro. diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h index 85f22634c..fd386c5fb 100644 --- a/newlib/libc/iconv/lib/local.h +++ b/newlib/libc/iconv/lib/local.h @@ -41,7 +41,11 @@ #define ICONV_DATA_EXT ".cct" /* This macro is used to zero mbstate_t objects */ +#ifdef __GNUC__ #define ICONV_ZERO_MB_STATE_T ((mbstate_t){0, {0}}) +#else +#define ICONV_ZERO_MB_STATE_T {0} +#endif /* Define the maximum multi-byte character length produced by iconv library */ #if MB_LEN_MAX < 6 diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c index 4dab2e19d..cc5ceb953 100644 --- a/newlib/libc/iconv/lib/ucsconv.c +++ b/newlib/libc/iconv/lib/ucsconv.c @@ -258,20 +258,21 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction), int direction) { iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data; + mbstate_t nullstate = ICONV_ZERO_MB_STATE_T; if (direction == 0) { if (uc->to_ucs.handlers->get_state != NULL) uc->to_ucs.handlers->get_state (uc->to_ucs.data, state); else - *state = ICONV_ZERO_MB_STATE_T; + *state = nullstate; /* internal copy */ } else { if (uc->from_ucs.handlers->get_state != NULL) uc->from_ucs.handlers->get_state (uc->from_ucs.data, state); else - *state = ICONV_ZERO_MB_STATE_T; + *state = nullstate; /* internal copy */ } return; |