[Midnightbsd-cvs] src [9686] trunk/lib/libiconv_modules: sync with freebsd 10 stable
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 16 11:23:20 EST 2017
Revision: 9686
http://svnweb.midnightbsd.org/src/?rev=9686
Author: laffer1
Date: 2017-12-16 11:23:19 -0500 (Sat, 16 Dec 2017)
Log Message:
-----------
sync with freebsd 10 stable
Modified Paths:
--------------
trunk/lib/libiconv_modules/DECHanyu/Makefile
trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
trunk/lib/libiconv_modules/EUC/Makefile
trunk/lib/libiconv_modules/EUC/citrus_euc.c
trunk/lib/libiconv_modules/EUC/citrus_euc.h
trunk/lib/libiconv_modules/EUCTW/Makefile
trunk/lib/libiconv_modules/EUCTW/citrus_euctw.c
trunk/lib/libiconv_modules/EUCTW/citrus_euctw.h
trunk/lib/libiconv_modules/GBK2K/Makefile
trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
trunk/lib/libiconv_modules/HZ/Makefile
trunk/lib/libiconv_modules/HZ/citrus_hz.c
trunk/lib/libiconv_modules/HZ/citrus_hz.h
trunk/lib/libiconv_modules/ISO2022/Makefile
trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.c
trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.h
trunk/lib/libiconv_modules/JOHAB/Makefile
trunk/lib/libiconv_modules/JOHAB/citrus_johab.c
trunk/lib/libiconv_modules/JOHAB/citrus_johab.h
trunk/lib/libiconv_modules/MSKanji/Makefile
trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.c
trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.h
trunk/lib/libiconv_modules/Makefile
trunk/lib/libiconv_modules/Makefile.inc
trunk/lib/libiconv_modules/UES/Makefile
trunk/lib/libiconv_modules/UES/citrus_ues.c
trunk/lib/libiconv_modules/UES/citrus_ues.h
trunk/lib/libiconv_modules/UTF1632/Makefile
trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.c
trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.h
trunk/lib/libiconv_modules/UTF7/Makefile
trunk/lib/libiconv_modules/UTF7/citrus_utf7.c
trunk/lib/libiconv_modules/UTF7/citrus_utf7.h
trunk/lib/libiconv_modules/UTF8/Makefile
trunk/lib/libiconv_modules/UTF8/citrus_utf8.c
trunk/lib/libiconv_modules/UTF8/citrus_utf8.h
trunk/lib/libiconv_modules/VIQR/Makefile
trunk/lib/libiconv_modules/VIQR/citrus_viqr.c
trunk/lib/libiconv_modules/VIQR/citrus_viqr.h
trunk/lib/libiconv_modules/ZW/Makefile
trunk/lib/libiconv_modules/ZW/citrus_zw.c
trunk/lib/libiconv_modules/ZW/citrus_zw.h
trunk/lib/libiconv_modules/iconv_none/Makefile
trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
trunk/lib/libiconv_modules/iconv_std/Makefile
trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
trunk/lib/libiconv_modules/mapper_646/Makefile
trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
trunk/lib/libiconv_modules/mapper_none/Makefile
trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
trunk/lib/libiconv_modules/mapper_parallel/Makefile
trunk/lib/libiconv_modules/mapper_serial/Makefile
trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
trunk/lib/libiconv_modules/mapper_std/Makefile
trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
trunk/lib/libiconv_modules/mapper_zone/Makefile
trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
Property Changed:
----------------
trunk/lib/libiconv_modules/Makefile.inc
Modified: trunk/lib/libiconv_modules/DECHanyu/Makefile
===================================================================
--- trunk/lib/libiconv_modules/DECHanyu/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/DECHanyu/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/DECHanyu/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= DECHanyu
SRCS+= citrus_dechanyu.c
Modified: trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
===================================================================
--- trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_dechanyu.c,v 1.3 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_dechanyu.c,v 1.4 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
* Copyright (c)2007 Citrus Project,
@@ -78,6 +79,7 @@
psenc->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei __unused,
@@ -96,6 +98,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static void
/*ARGSUSED*/
Modified: trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
===================================================================
--- trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_dechanyu.h,v 1.1 2007/04/01 18:52:32 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/EUC/Makefile
===================================================================
--- trunk/lib/libiconv_modules/EUC/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUC/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/EUC/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= EUC
SRCS+= citrus_euc.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/EUC/citrus_euc.c
===================================================================
--- trunk/lib/libiconv_modules/EUC/citrus_euc.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUC/citrus_euc.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/EUC/citrus_euc.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_euc.c,v 1.14 2009/01/11 02:46:24 christos Exp $ */
/*-
@@ -169,6 +170,7 @@
memset(s, 0, sizeof(*s));
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_EUC_pack_state(_EUCEncodingInfo *ei __unused, void *pspriv,
@@ -186,6 +188,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static int
_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s,
Modified: trunk/lib/libiconv_modules/EUC/citrus_euc.h
===================================================================
--- trunk/lib/libiconv_modules/EUC/citrus_euc.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUC/citrus_euc.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/EUC/citrus_euc.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_euc.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/EUCTW/Makefile
===================================================================
--- trunk/lib/libiconv_modules/EUCTW/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUCTW/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/EUCTW/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= EUCTW
SRCS+= citrus_euctw.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/EUCTW/citrus_euctw.c
===================================================================
--- trunk/lib/libiconv_modules/EUCTW/citrus_euctw.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUCTW/citrus_euctw.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_euctw.c,v 1.11 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
@@ -119,7 +120,7 @@
case 1:
/*FALLTHROUGH*/
case 2:
- return (2^cs);
+ return (1 << cs);
case 3:
abort();
/*NOTREACHED*/
@@ -136,6 +137,7 @@
memset(s, 0, sizeof(*s));
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei __unused,
@@ -153,6 +155,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static int
/*ARGSUSED*/
Modified: trunk/lib/libiconv_modules/EUCTW/citrus_euctw.h
===================================================================
--- trunk/lib/libiconv_modules/EUCTW/citrus_euctw.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/EUCTW/citrus_euctw.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_euctw.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/GBK2K/Makefile
===================================================================
--- trunk/lib/libiconv_modules/GBK2K/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/GBK2K/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/GBK2K/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= GBK2K
SRCS+= citrus_gbk2k.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
===================================================================
--- trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_gbk2k.c,v 1.7 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
@@ -80,6 +81,7 @@
memset(s, 0, sizeof(*s));
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei __unused,
@@ -97,6 +99,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static __inline bool
_mb_singlebyte(int c)
Modified: trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
===================================================================
--- trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/GBK2K/citrus_gbk2k.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_gbk2k.h,v 1.2 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/HZ/Makefile
===================================================================
--- trunk/lib/libiconv_modules/HZ/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/HZ/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/HZ/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= HZ
SRCS+= citrus_hz.c
Modified: trunk/lib/libiconv_modules/HZ/citrus_hz.c
===================================================================
--- trunk/lib/libiconv_modules/HZ/citrus_hz.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/HZ/citrus_hz.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/HZ/citrus_hz.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_hz.c,v 1.2 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
@@ -65,8 +66,8 @@
} charset_t;
typedef struct {
+ int start;
int end;
- int start;
int width;
} range_t;
@@ -153,6 +154,7 @@
psenc->inuse = INIT0(ei);
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei __unused,
@@ -170,6 +172,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static int
_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,
@@ -503,12 +506,12 @@
}
static int
-_citrus_HZ_parse_char(void **context, const char *name __unused, const char *s)
+_citrus_HZ_parse_char(void *context, const char *name __unused, const char *s)
{
escape_t *escape;
void **p;
- p = (void **)*context;
+ p = (void **)context;
escape = (escape_t *)p[0];
if (escape->ch != '\0')
return (EINVAL);
@@ -520,7 +523,7 @@
}
static int
-_citrus_HZ_parse_graphic(void **context, const char *name, const char *s)
+_citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
{
_HZEncodingInfo *ei;
escape_t *escape;
@@ -527,13 +530,12 @@
graphic_t *graphic;
void **p;
- p = (void **)*context;
+ p = (void **)context;
escape = (escape_t *)p[0];
ei = (_HZEncodingInfo *)p[1];
- graphic = malloc(sizeof(*graphic));
+ graphic = calloc(1, sizeof(*graphic));
if (graphic == NULL)
return (ENOMEM);
- memset(graphic, 0, sizeof(*graphic));
if (strcmp("GL", name) == 0) {
if (GL(escape) != NULL)
goto release;
@@ -589,17 +591,16 @@
};
static int
-_citrus_HZ_parse_escape(void **context, const char *name, const char *s)
+_citrus_HZ_parse_escape(void *context, const char *name, const char *s)
{
_HZEncodingInfo *ei;
escape_t *escape;
void *p[2];
- ei = (_HZEncodingInfo *)*context;
- escape = malloc(sizeof(*escape));
+ ei = (_HZEncodingInfo *)context;
+ escape = calloc(1, sizeof(*escape));
if (escape == NULL)
return (EINVAL);
- memset(escape, 0, sizeof(*escape));
if (strcmp("0", name) == 0) {
escape->set = E0SET(ei);
TAILQ_INSERT_TAIL(E0SET(ei), escape, entry);
Modified: trunk/lib/libiconv_modules/HZ/citrus_hz.h
===================================================================
--- trunk/lib/libiconv_modules/HZ/citrus_hz.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/HZ/citrus_hz.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/HZ/citrus_hz.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_hz.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/ISO2022/Makefile
===================================================================
--- trunk/lib/libiconv_modules/ISO2022/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ISO2022/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/ISO2022/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= ISO2022
SRCS+= citrus_iso2022.c
-CFLAGS+= --param max-inline-insns-single=128
+CFLAGS.gcc+= --param max-inline-insns-single=128
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.c
===================================================================
--- trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_iso2022.c,v 1.19 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_iso2022.c,v 1.20 2010/12/07 22:01:45 joerg Exp $ */
/*-
* Copyright (c)1999, 2002 Citrus Project,
@@ -78,9 +79,9 @@
#define CS96MULTI (3U)
typedef struct {
+ unsigned char type;
+ unsigned char final;
unsigned char interm;
- unsigned char final;
- unsigned char type;
unsigned char vers;
} _ISO2022Charset;
@@ -444,6 +445,7 @@
s->flags |= _ISO2022STATE_FLAG_INITIALIZED;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei __unused,
@@ -461,6 +463,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static int
/*ARGSUSED*/
Modified: trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.h
===================================================================
--- trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ISO2022/citrus_iso2022.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_iso2022.h,v 1.2 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/JOHAB/Makefile
===================================================================
--- trunk/lib/libiconv_modules/JOHAB/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/JOHAB/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/JOHAB/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= JOHAB
SRCS+= citrus_johab.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/JOHAB/citrus_johab.c
===================================================================
--- trunk/lib/libiconv_modules/JOHAB/citrus_johab.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/JOHAB/citrus_johab.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_johab.c,v 1.4 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
@@ -80,6 +81,7 @@
psenc->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei __unused,
@@ -97,6 +99,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static void
/*ARGSUSED*/
Modified: trunk/lib/libiconv_modules/JOHAB/citrus_johab.h
===================================================================
--- trunk/lib/libiconv_modules/JOHAB/citrus_johab.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/JOHAB/citrus_johab.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/JOHAB/citrus_johab.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_johab.h,v 1.1 2006/10/18 17:54:55 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/MSKanji/Makefile
===================================================================
--- trunk/lib/libiconv_modules/MSKanji/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/MSKanji/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/MSKanji/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= MSKanji
SRCS+= citrus_mskanji.c
Modified: trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.c
===================================================================
--- trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_mskanji.c,v 1.13 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
@@ -130,6 +131,7 @@
s->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei __unused,
@@ -147,6 +149,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static int
/*ARGSUSED*/
Modified: trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.h
===================================================================
--- trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/MSKanji/citrus_mskanji.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mskanji.h,v 1.2 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/Makefile
===================================================================
--- trunk/lib/libiconv_modules/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/Makefile 291792 2015-12-04 18:14:31Z bdrewery $
.include <bsd.own.mk>
@@ -5,5 +6,6 @@
SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \
UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \
mapper_parallel mapper_serial mapper_std mapper_zone
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: trunk/lib/libiconv_modules/Makefile.inc
===================================================================
--- trunk/lib/libiconv_modules/Makefile.inc 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/Makefile.inc 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,10 +1,14 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/Makefile.inc 313626 2017-02-11 07:02:04Z ngie $
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
SHLIB_MAJOR= 4
WARNS?= 6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
+
+CFLAGS+= -Dbool=_Bool
+
.if !defined(COMPAT_32BIT)
SHLIBDIR= /usr/lib/i18n
.else
Property changes on: trunk/lib/libiconv_modules/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libiconv_modules/UES/Makefile
===================================================================
--- trunk/lib/libiconv_modules/UES/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UES/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/UES/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= UES
SRCS+= citrus_ues.c
-CFLAGS+= --param max-inline-insns-single=64
+CFLAGS.gcc+= --param max-inline-insns-single=64
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/UES/citrus_ues.c
===================================================================
--- trunk/lib/libiconv_modules/UES/citrus_ues.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UES/citrus_ues.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_ues.c,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UES/citrus_ues.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_ues.c,v 1.3 2012/02/12 13:51:29 wiz Exp $ */
/*-
* Copyright (c)2006 Citrus Project,
@@ -75,6 +76,7 @@
psenc->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_UES_pack_state(_UESEncodingInfo * __restrict ei __unused,
@@ -92,6 +94,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static __inline int
to_int(int ch)
Modified: trunk/lib/libiconv_modules/UES/citrus_ues.h
===================================================================
--- trunk/lib/libiconv_modules/UES/citrus_ues.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UES/citrus_ues.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UES/citrus_ues.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_ues.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/UTF1632/Makefile
===================================================================
--- trunk/lib/libiconv_modules/UTF1632/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF1632/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/UTF1632/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= UTF1632
SRCS+= citrus_utf1632.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.c
===================================================================
--- trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.h
===================================================================
--- trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF1632/citrus_utf1632.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_utf1632.h,v 1.1 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/UTF7/Makefile
===================================================================
--- trunk/lib/libiconv_modules/UTF7/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF7/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/UTF7/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= UTF7
SRCS+= citrus_utf7.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/UTF7/citrus_utf7.c
===================================================================
--- trunk/lib/libiconv_modules/UTF7/citrus_utf7.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF7/citrus_utf7.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c 283908 2015-06-02 09:42:00Z tijl $ */
/* $NetBSD: citrus_utf7.c,v 1.5 2006/08/23 12:57:24 tnozaki Exp $ */
/*-
@@ -62,8 +63,7 @@
unsigned int
mode: 1, /* whether base64 mode */
bits: 4, /* need to hold 0 - 15 */
- cache: 22, /* 22 = BASE64_BIT + UTF16_BIT */
- surrogate: 1; /* whether surrogate pair or not */
+ cache: 22; /* 22 = BASE64_BIT + UTF16_BIT */
int chlen;
char ch[4]; /* BASE64_IN, 3 * 6 = 18, most closed to UTF16_BIT */
} _UTF7State;
@@ -87,6 +87,7 @@
memset((void *)s, 0, sizeof(*s));
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_UTF7_pack_state(_UTF7EncodingInfo * __restrict ei __unused,
@@ -104,6 +105,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static const char base64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -113,9 +115,9 @@
static const char direct[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
- "0123456789(),-./:?";
+ "0123456789'(),-./:?";
-static const char option[] = "!\"#$%&';<=>@[]^_`{|}";
+static const char option[] = "!\"#$%&*;<=>@[]^_`{|}";
static const char spaces[] = " \t\r\n";
#define BASE64_BIT 6
@@ -152,12 +154,11 @@
uint16_t * __restrict u16, char ** __restrict s, size_t n,
_UTF7State * __restrict psenc, size_t * __restrict nresult)
{
- _UTF7State sv;
char *s0;
int done, i, len;
+ *nresult = 0;
s0 = *s;
- sv = *psenc;
for (i = 0, done = 0; done == 0; i++) {
if (i == psenc->chlen) {
@@ -164,8 +165,6 @@
if (n-- < 1) {
*nresult = (size_t)-2;
*s = s0;
- sv.chlen = psenc->chlen;
- *psenc = sv;
return (0);
}
psenc->ch[psenc->chlen++] = *s0++;
@@ -202,6 +201,9 @@
goto ilseq;
*u16 = (uint16_t)psenc->ch[i];
done = 1;
+ } else {
+ psenc->chlen--;
+ i--;
}
} else {
psenc->cache =
@@ -241,7 +243,6 @@
wchar_t * __restrict pwc, char ** __restrict s, size_t n,
_UTF7State * __restrict psenc, size_t * __restrict nresult)
{
- char *s0;
uint32_t u32;
uint16_t hi, lo;
size_t nr, siz;
@@ -252,41 +253,36 @@
*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
return (0);
}
- s0 = *s;
- if (psenc->surrogate) {
- hi = (psenc->cache >> 2) & UTF16_MAX;
- if (hi < HISRG_MIN || hi > HISRG_MAX)
- return (EINVAL);
- siz = 0;
- } else {
- err = _citrus_UTF7_mbtoutf16(ei, &hi, &s0, n, psenc, &nr);
- if (nr == (size_t)-1 || nr == (size_t)-2) {
- *nresult = nr;
- return (err);
- }
- if (err != 0)
- return (err);
- n -= nr;
- siz = nr;
- if (hi < HISRG_MIN || hi > HISRG_MAX) {
- u32 = (uint32_t)hi;
- goto done;
- }
- psenc->surrogate = 1;
+ err = _citrus_UTF7_mbtoutf16(ei, &hi, s, n, psenc, &nr);
+ if (nr == (size_t)-1 || nr == (size_t)-2) {
+ *nresult = nr;
+ return (err);
}
- err = _citrus_UTF7_mbtoutf16(ei, &lo, &s0, n, psenc, &nr);
+ if (err != 0)
+ return (err);
+ n -= nr;
+ siz = nr;
+ if (hi < HISRG_MIN || hi > HISRG_MAX) {
+ u32 = (uint32_t)hi;
+ goto done;
+ }
+ err = _citrus_UTF7_mbtoutf16(ei, &lo, s, n, psenc, &nr);
if (nr == (size_t)-1 || nr == (size_t)-2) {
+ psenc->chlen = 1; /* make get_state_desc return incomplete */
*nresult = nr;
return (err);
}
if (err != 0)
return (err);
+ if (lo < LOSRG_MIN || lo > LOSRG_MAX) {
+ *nresult = (size_t)-1;
+ return (EILSEQ);
+ }
hi -= HISRG_MIN;
lo -= LOSRG_MIN;
u32 = (hi << 10 | lo) + SRG_BASE;
siz += nr;
done:
- *s = s0;
if (pwc != NULL)
*pwc = (wchar_t)u32;
if (u32 == (uint32_t)0) {
@@ -294,7 +290,6 @@
_citrus_UTF7_init_state(ei, psenc);
} else {
*nresult = siz;
- psenc->surrogate = 0;
}
return (err);
}
@@ -393,7 +388,7 @@
{
int bits, pos;
- if (psenc->chlen != 0 || psenc->bits > BASE64_BIT || psenc->surrogate)
+ if (psenc->chlen != 0 || psenc->bits > BASE64_BIT)
return (EINVAL);
if (psenc->mode) {
Modified: trunk/lib/libiconv_modules/UTF7/citrus_utf7.h
===================================================================
--- trunk/lib/libiconv_modules/UTF7/citrus_utf7.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF7/citrus_utf7.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF7/citrus_utf7.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_utf7.h,v 1.1 2005/03/05 18:05:15 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/UTF8/Makefile
===================================================================
--- trunk/lib/libiconv_modules/UTF8/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF8/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/UTF8/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= UTF8
SRCS+= citrus_utf8.c
Modified: trunk/lib/libiconv_modules/UTF8/citrus_utf8.c
===================================================================
--- trunk/lib/libiconv_modules/UTF8/citrus_utf8.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF8/citrus_utf8.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_utf8.c,v 1.17 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
@@ -156,6 +157,7 @@
s->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_UTF8_pack_state(_UTF8EncodingInfo *ei __unused, void *pspriv,
@@ -173,6 +175,7 @@
memcpy((void *)s, pspriv, sizeof(*s));
}
+#endif
static int
_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s,
Modified: trunk/lib/libiconv_modules/UTF8/citrus_utf8.h
===================================================================
--- trunk/lib/libiconv_modules/UTF8/citrus_utf8.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/UTF8/citrus_utf8.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/UTF8/citrus_utf8.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_utf8.h,v 1.2 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/VIQR/Makefile
===================================================================
--- trunk/lib/libiconv_modules/VIQR/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/VIQR/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/VIQR/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= VIQR
SRCS+= citrus_viqr.c
Modified: trunk/lib/libiconv_modules/VIQR/citrus_viqr.c
===================================================================
--- trunk/lib/libiconv_modules/VIQR/citrus_viqr.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/VIQR/citrus_viqr.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_viqr.c,v 1.4 2008/06/14 16:01:08 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_viqr.c,v 1.5 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
* Copyright (c)2006 Citrus Project,
@@ -230,6 +231,7 @@
psenc->chlen = 0;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_VIQR_pack_state(_VIQREncodingInfo * __restrict ei __unused,
@@ -247,6 +249,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static int
_citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,
@@ -431,7 +434,6 @@
_citrus_VIQR_encoding_module_init(_VIQREncodingInfo * __restrict ei,
const void * __restrict var __unused, size_t lenvar __unused)
{
- const mnemonic_def_t *p;
const char *s;
size_t i, n;
int errnum;
@@ -455,7 +457,10 @@
return (errnum);
}
}
- for (i = 0;; ++i) {
+ /* a + 1 < b + 1 here to silence gcc warning about unsigned < 0. */
+ for (i = 0; i + 1 < mnemonic_ext_size + 1; ++i) {
+ const mnemonic_def_t *p;
+
p = &mnemonic_ext[i];
n = strlen(p->name);
if (ei->mb_cur_max < n)
Modified: trunk/lib/libiconv_modules/VIQR/citrus_viqr.h
===================================================================
--- trunk/lib/libiconv_modules/VIQR/citrus_viqr.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/VIQR/citrus_viqr.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/VIQR/citrus_viqr.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_viqr.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/ZW/Makefile
===================================================================
--- trunk/lib/libiconv_modules/ZW/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ZW/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/ZW/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= ZW
SRCS+= citrus_zw.c
Modified: trunk/lib/libiconv_modules/ZW/citrus_zw.c
===================================================================
--- trunk/lib/libiconv_modules/ZW/citrus_zw.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ZW/citrus_zw.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/ZW/citrus_zw.c 282275 2015-04-30 16:08:47Z tijl $ */
/* $NetBSD: citrus_zw.c,v 1.4 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
@@ -85,6 +86,7 @@
psenc->charset = NONE;
}
+#if 0
static __inline void
/*ARGSUSED*/
_citrus_ZW_pack_state(_ZWEncodingInfo * __restrict ei __unused,
@@ -102,6 +104,7 @@
memcpy((void *)psenc, pspriv, sizeof(*psenc));
}
+#endif
static int
_citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,
Modified: trunk/lib/libiconv_modules/ZW/citrus_zw.h
===================================================================
--- trunk/lib/libiconv_modules/ZW/citrus_zw.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/ZW/citrus_zw.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/ZW/citrus_zw.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_zw.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/iconv_none/Makefile
===================================================================
--- trunk/lib/libiconv_modules/iconv_none/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_none/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/iconv_none/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= iconv_none
SRCS+= citrus_iconv_none.c
Modified: trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
===================================================================
--- trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_iconv_none.c,v 1.2 2003/07/01 09:42:16 tshiozak Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
Modified: trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
===================================================================
--- trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_none/citrus_iconv_none.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_iconv_none.h,v 1.1 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/iconv_std/Makefile
===================================================================
--- trunk/lib/libiconv_modules/iconv_std/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_std/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/iconv_std/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= iconv_std
SRCS+= citrus_iconv_std.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
===================================================================
--- trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_iconv_std.c,v 1.15 2006/11/13 19:08:19 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c 282275 2015-04-30 16:08:47Z tijl $ */
+/* $NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
Modified: trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
===================================================================
--- trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_iconv_std.h,v 1.1 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
===================================================================
--- trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_iconv_std_local.h,v 1.2 2003/07/01 09:42:16 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_646/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_646/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_646/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_646/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= mapper_646
SRCS= citrus_mapper_646.c
Modified: trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
===================================================================
--- trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_646/citrus_mapper_646.c 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_646.c,v 1.4 2003/07/14 11:37:49 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_646/citrus_mapper_646.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_646/citrus_mapper_646.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_646.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_none/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_none/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_none/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_none/Makefile 219019 2011-02-25 00:04:39Z gabor $
SHLIB= mapper_none
SRCS+= citrus_mapper_none.c
Modified: trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
===================================================================
--- trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_none/citrus_mapper_none.c 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_none.c,v 1.2 2003/06/27 17:53:31 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_none/citrus_mapper_none.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_none/citrus_mapper_none.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_none.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_parallel/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_parallel/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_parallel/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_parallel/Makefile 313626 2017-02-11 07:02:04Z ngie $
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
SHLIB= mapper_parallel
SRCS+= citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/mapper_serial/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_serial/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_serial/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_serial/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= mapper_serial
SRCS+= citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
===================================================================
--- trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_serial.c,v 1.2 2003/07/12 15:39:20 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_serial.h,v 1.1 2003/06/25 09:51:46 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_std/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_std/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_std/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_std/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= mapper_std
SRCS+= citrus_mapper_std.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
===================================================================
--- trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/* $NetBSD: citrus_mapper_std.c,v 1.8 2006/09/11 13:06:33 tnozaki Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_std/citrus_mapper_std.c 264497 2014-04-15 09:49:44Z tijl $ */
+/* $NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $ */
/*-
* Copyright (c)2003, 2006 Citrus Project,
@@ -174,8 +175,11 @@
n = be32toh(rcx->rcx_src_row_end);
if (m + n > 0) {
ret = set_linear_zone(lz, m, n);
- if (ret != 0)
+ if (ret != 0) {
+ free(rc->rc_src_rowcol);
+ rc->rc_src_rowcol = NULL;
return (ret);
+ }
++rc->rc_src_rowcol_len, ++lz;
}
m = be32toh(rcx->rcx_src_col_begin);
Modified: trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_std/citrus_mapper_std.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_std.h,v 1.1 2003/06/25 09:51:47 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_std_file.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_std_local.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_zone/Makefile
===================================================================
--- trunk/lib/libiconv_modules/mapper_zone/Makefile 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_zone/Makefile 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/mapper_zone/Makefile 260497 2014-01-09 23:08:56Z dim $
SHLIB= mapper_zone
SRCS+= citrus_mapper_zone.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
.include <bsd.lib.mk>
Modified: trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
===================================================================
--- trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_zone.c,v 1.4 2003/07/12 15:39:21 tshiozak Exp $ */
/*-
Modified: trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
===================================================================
--- trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h 2017-12-16 16:19:29 UTC (rev 9685)
+++ trunk/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h 2017-12-16 16:23:19 UTC (rev 9686)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h 219019 2011-02-25 00:04:39Z gabor $ */
/* $NetBSD: citrus_mapper_zone.h,v 1.1 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
More information about the Midnightbsd-cvs
mailing list