diff options
| author | tijl <tijl@FreeBSD.org> | 2014-04-01 10:36:11 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-04-01 10:36:11 +0000 |
| commit | 88044d5054a5a9ee1908c6ad4008b13d3884c0e1 (patch) | |
| tree | f9b134d1c2e9aeb112253f7bcccc6d87c34301b9 /lib/libiconv_modules/EUCTW | |
| parent | 129b50ccf040c8abde55cf17aa9543018ae9caa8 (diff) | |
| download | FreeBSD-src-88044d5054a5a9ee1908c6ad4008b13d3884c0e1.zip FreeBSD-src-88044d5054a5a9ee1908c6ad4008b13d3884c0e1.tar.gz | |
- In the libiconv module for ISO 2022 restore the original order of the
fields of a private struct such that variables of this type are
initialised correctly. Fixes conversion from ISO 2022.
Also do this in the BIG5 module to prevent similar errors in the future.
- In the libiconv module for EUC-TW replace 2^cs with 1<<cs. Fixes
conversion from EUC-TW.
- Synchronise iconv code with NetBSD. In most cases this only updates
the RCS id because the changes are already there or are NetBSD specific.
+ libc/iconv/citrus_csmapper.c: Add a comment.
+ libc/iconv/citrus_db_factory.c: Remove put16().
+ libc/iconv/citrus_iconv.c: Return EINVAL on error.
+ libc/iconv/citrus_mapper.c: Return EINVAL on error.
+ libc/iconv/citrus_memstream.c: Fix type of a variable.
+ libc/iconv/citrus_prop.h: Sync definition of _CITRUS_PROP_HINT_END.
+ libc/iconv/citrus_stdenc.c: Return EINVAL on error.
+ libiconv_modules/mapper_std/citrus_mapper_std.c: Plug memory leak.
Obtained from: NetBSD
MFC after: 2 weeks
Diffstat (limited to 'lib/libiconv_modules/EUCTW')
| -rw-r--r-- | lib/libiconv_modules/EUCTW/citrus_euctw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.c b/lib/libiconv_modules/EUCTW/citrus_euctw.c index 36b43c7..c35423e 100644 --- a/lib/libiconv_modules/EUCTW/citrus_euctw.c +++ b/lib/libiconv_modules/EUCTW/citrus_euctw.c @@ -119,7 +119,7 @@ _citrus_EUCTW_count(int cs) case 1: /*FALLTHROUGH*/ case 2: - return (2^cs); + return (1 << cs); case 3: abort(); /*NOTREACHED*/ |
