diff options
author | tijl <tijl@FreeBSD.org> | 2014-04-15 09:49:44 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-04-15 09:49:44 +0000 |
commit | 1cbbe6f2d4f3072dbd2c8607cd56bea514637d82 (patch) | |
tree | a9679901144507309a5b71a4e0ae37b76368fb52 /lib/libc/iconv/citrus_db_factory.c | |
parent | e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26 (diff) | |
download | FreeBSD-src-1cbbe6f2d4f3072dbd2c8607cd56bea514637d82.zip FreeBSD-src-1cbbe6f2d4f3072dbd2c8607cd56bea514637d82.tar.gz |
MFC r263986:
- 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
Diffstat (limited to 'lib/libc/iconv/citrus_db_factory.c')
-rw-r--r-- | lib/libc/iconv/citrus_db_factory.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c index 9a3edf2..e9823ab 100644 --- a/lib/libc/iconv/citrus_db_factory.c +++ b/lib/libc/iconv/citrus_db_factory.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $NetBSD: citrus_db_factory.c,v 1.9 2008/02/09 14:56:20 junyoung Exp $ */ +/* $NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $ */ /*- * Copyright (c)2003 Citrus Project, @@ -228,15 +228,6 @@ put8(struct _region *r, size_t *rofs, uint8_t val) } static __inline void -put16(struct _region *r, size_t *rofs, uint16_t val) -{ - - val = htons(val); - memcpy(_region_offset(r, *rofs), &val, 2); - *rofs += 2; -} - -static __inline void put32(struct _region *r, size_t *rofs, uint32_t val) { |