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_prop.h | |
| 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_prop.h')
| -rw-r--r-- | lib/libc/iconv/citrus_prop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/iconv/citrus_prop.h b/lib/libc/iconv/citrus_prop.h index 2962154..48fc066 100644 --- a/lib/libc/iconv/citrus_prop.h +++ b/lib/libc/iconv/citrus_prop.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $NetBSD: citrus_prop.h,v 1.3 2006/11/23 13:59:03 tnozaki Exp $ */ +/* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */ /*- * Copyright (c)2006 Citrus Project, @@ -82,7 +82,7 @@ struct _citrus_prop_hint_t { #define _CITRUS_PROP_HINT_NUM(name, cb) \ { name, _CITRUS_PROP_NUM, { .num = { cb } } } #define _CITRUS_PROP_HINT_END \ - { NULL, _CITRUS_PROP_NUM, { .num = { 0 } } } + { .name = NULL } __BEGIN_DECLS int _citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict, |
