[Midnightbsd-cvs] src [9685] trunk/lib/libiconv_modules/BIG5: clang fix

[laffer1 at midnightbsd.org]

Revision: 9685
          http://svnweb.midnightbsd.org/src/?rev=9685
Author:   laffer1
Date:     2017-12-16 11:19:29 -0500 (Sat, 16 Dec 2017)
Log Message:
-----------
clang fix

Modified Paths:
--------------
    trunk/lib/libiconv_modules/BIG5/Makefile
    trunk/lib/libiconv_modules/BIG5/citrus_big5.c
    trunk/lib/libiconv_modules/BIG5/citrus_big5.h

Modified: trunk/lib/libiconv_modules/BIG5/Makefile
===================================================================
--- trunk/lib/libiconv_modules/BIG5/Makefile	2017-12-16 05:24:33 UTC (rev 9684)
+++ trunk/lib/libiconv_modules/BIG5/Makefile	2017-12-16 16:19:29 UTC (rev 9685)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libiconv_modules/BIG5/Makefile 260497 2014-01-09 23:08:56Z dim $
 
 SHLIB=	BIG5
 SRCS+=	citrus_big5.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/BIG5/citrus_big5.c
===================================================================
--- trunk/lib/libiconv_modules/BIG5/citrus_big5.c	2017-12-16 05:24:33 UTC (rev 9684)
+++ trunk/lib/libiconv_modules/BIG5/citrus_big5.c	2017-12-16 16:19:29 UTC (rev 9685)
@@ -1,5 +1,6 @@
-/* $FreeBSD$ */
-/*	$NetBSD: citrus_big5.c,v 1.12 2008/06/14 16:01:07 tnozaki Exp $	*/
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c 282275 2015-04-30 16:08:47Z tijl $ */
+/*	$NetBSD: citrus_big5.c,v 1.13 2011/05/23 14:53:46 joerg Exp $	*/
 
 /*-
  * Copyright (c)2002, 2006 Citrus Project,
@@ -92,8 +93,8 @@
 
 typedef struct _BIG5Exclude {
 	TAILQ_ENTRY(_BIG5Exclude)	 entry;
+	wint_t				 start;
 	wint_t				 end;
-	wint_t				 start;
 } _BIG5Exclude;
 
 typedef TAILQ_HEAD(_BIG5ExcludeList, _BIG5Exclude) _BIG5ExcludeList;
@@ -123,6 +124,7 @@
 	memset(s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei __unused,
@@ -142,6 +144,7 @@
 
 	memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static __inline int
 _citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c)
@@ -170,7 +173,7 @@
 }
 
 static int
-_citrus_BIG5_fill_rowcol(void ** __restrict ctx, const char * __restrict s,
+_citrus_BIG5_fill_rowcol(void * __restrict ctx, const char * __restrict s,
     uint64_t start, uint64_t end)
 {
 	_BIG5EncodingInfo *ei;
@@ -189,7 +192,7 @@
 
 static int
 /*ARGSUSED*/
-_citrus_BIG5_fill_excludes(void ** __restrict ctx,
+_citrus_BIG5_fill_excludes(void * __restrict ctx,
     const char * __restrict s __unused, uint64_t start, uint64_t end)
 {
 	_BIG5EncodingInfo *ei;
@@ -235,7 +238,6 @@
 _citrus_BIG5_encoding_module_init(_BIG5EncodingInfo * __restrict ei,
     const void * __restrict var, size_t lenvar)
 {
-	void *ctx = (void *)ei;
 	const char *s;
 	int err;
 
@@ -257,9 +259,9 @@
 	}
 
 	/* fallback Big5-1984, for backward compatibility. */
-	_citrus_BIG5_fill_rowcol((void **)&ctx, "row", 0xA1, 0xFE);
-	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0x40, 0x7E);
-	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0xA1, 0xFE);
+	_citrus_BIG5_fill_rowcol(ei, "row", 0xA1, 0xFE);
+	_citrus_BIG5_fill_rowcol(ei, "col", 0x40, 0x7E);
+	_citrus_BIG5_fill_rowcol(ei, "col", 0xA1, 0xFE);
 
 	return (0);
 }
@@ -357,7 +359,7 @@
     size_t n, wchar_t wc, _BIG5State * __restrict psenc __unused,
     size_t * __restrict nresult)
 {
-	unsigned char l;
+	size_t l;
 	int ret;
 
 	/* check invalid sequence */

Modified: trunk/lib/libiconv_modules/BIG5/citrus_big5.h
===================================================================
--- trunk/lib/libiconv_modules/BIG5/citrus_big5.h	2017-12-16 05:24:33 UTC (rev 9684)
+++ trunk/lib/libiconv_modules/BIG5/citrus_big5.h	2017-12-16 16:19:29 UTC (rev 9685)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/libiconv_modules/BIG5/citrus_big5.h 219019 2011-02-25 00:04:39Z gabor $ */
 /*	$NetBSD: citrus_big5.h,v 1.2 2003/06/25 09:51:41 tshiozak Exp $	*/
 
 /*-