mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-18 00:10:04 +00:00
converters/iconv-extra: Refresh patches
This commit is contained in:
parent
66ba27fdfb
commit
0664d47527
@ -1,6 +1,6 @@
|
||||
--- ces/Makefile.orig Wed Nov 29 03:42:25 2000
|
||||
+++ ces/Makefile Fri Oct 21 11:24:04 2005
|
||||
@@ -4,8 +4,8 @@
|
||||
--- ces/Makefile.orig 2000-11-28 18:42:25 UTC
|
||||
+++ ces/Makefile
|
||||
@@ -4,8 +4,8 @@ all: ${CHARSETS_SO}
|
||||
all: ${CHARSETS_SO}
|
||||
|
||||
.if !defined(ICONVDIR_LIBC)
|
||||
@ -11,7 +11,7 @@
|
||||
.endif
|
||||
|
||||
INTERNALLIB =
|
||||
@@ -14,11 +14,11 @@ NOMAN =
|
||||
@@ -14,11 +14,11 @@ NOOBJ =
|
||||
|
||||
NOOBJ =
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ces/iso-2022-cn.c 2002/03/17 11:15:25 1.1
|
||||
+++ ces/iso-2022-cn.c 2002/03/17 11:15:46
|
||||
--- ces/iso-2022-cn.c.orig 2000-11-20 22:31:58 UTC
|
||||
+++ ces/iso-2022-cn.c
|
||||
@@ -31,7 +31,7 @@
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ces/iso-2022-jp-2.c 2002/03/17 11:15:25 1.1
|
||||
+++ ces/iso-2022-jp-2.c 2002/03/17 11:15:46
|
||||
--- ces/iso-2022-jp-2.c.orig 2000-11-20 22:35:03 UTC
|
||||
+++ ces/iso-2022-jp-2.c
|
||||
@@ -31,7 +31,7 @@
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ces/iso-2022-jp.c 2002/03/17 11:15:25 1.1
|
||||
+++ ces/iso-2022-jp.c 2002/03/17 11:15:46
|
||||
--- ces/iso-2022-jp.c.orig 2000-11-20 22:34:57 UTC
|
||||
+++ ces/iso-2022-jp.c
|
||||
@@ -31,7 +31,7 @@
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ces/iso-2022-kr.c 2002/03/17 11:15:25 1.1
|
||||
+++ ces/iso-2022-kr.c 2002/03/17 11:15:46
|
||||
--- ces/iso-2022-kr.c.orig 2000-11-20 22:37:35 UTC
|
||||
+++ ces/iso-2022-kr.c
|
||||
@@ -31,7 +31,7 @@
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,9 @@
|
||||
--- ces/unicode-1-1-utf-7.c 2002/03/17 11:20:12 1.1
|
||||
+++ ces/unicode-1-1-utf-7.c 2002/03/17 11:20:21
|
||||
Index: ces/unicode-1-1-utf-7.c
|
||||
===================================================================
|
||||
RCS file: /home/bbcvs/iconv/ces/unicode-1-1-utf-7.c,v
|
||||
retrieving revision 1.2
|
||||
--- ces/unicode-1-1-utf-7.c.orig 2024-06-07 14:57:13 UTC
|
||||
+++ ces/unicode-1-1-utf-7.c
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -9,3 +13,30 @@
|
||||
|
||||
static inline int
|
||||
lackofbytes(int bytes, size_t *bytesleft)
|
||||
@@ -230,7 +230,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module,
|
||||
if (*inbytesleft < 2)
|
||||
return UCS_CHAR_NONE;
|
||||
needbytes = 1;
|
||||
- ch = char_type(*(++((unsigned char *)*inbuf)));
|
||||
+ ch = char_type(*(++*inbuf));
|
||||
(*inbytesleft) --;
|
||||
case utf7_printable:
|
||||
utf7_state[0] = 0;
|
||||
@@ -246,7 +246,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module,
|
||||
(*inbytesleft) += needbytes;
|
||||
return UCS_CHAR_NONE;
|
||||
}
|
||||
- switch (char_type(*(++(unsigned char *)*inbuf))) {
|
||||
+ switch (char_type(*(++*inbuf))) {
|
||||
case utf7_shift_out:
|
||||
(*inbuf) ++;
|
||||
(*inbytesleft) -= 2;
|
||||
@@ -264,7 +264,7 @@ static ucs_t convert_to_ucs(struct iconv_ces *module,
|
||||
return UCS_CHAR_INVALID;
|
||||
}
|
||||
(*inbytesleft) --;
|
||||
- return *((unsigned char *)*inbuf) ++;
|
||||
+ return *(*inbuf)++;
|
||||
#undef utf7_state
|
||||
}
|
||||
|
||||
|
@ -1,34 +0,0 @@
|
||||
Index: ces/unicode-1-1-utf-7.c
|
||||
===================================================================
|
||||
RCS file: /home/bbcvs/iconv/ces/unicode-1-1-utf-7.c,v
|
||||
retrieving revision 1.2
|
||||
diff -u -r1.2 unicode-1-1-utf-7.c
|
||||
--- ces/unicode-1-1-utf-7.c 22 Mar 2005 16:41:03 -0000 1.2
|
||||
+++ ces/unicode-1-1-utf-7.c 14 Dec 2006 22:47:58 -0000
|
||||
@@ -233,7 +233,7 @@
|
||||
if (*inbytesleft < 2)
|
||||
return UCS_CHAR_NONE;
|
||||
needbytes = 1;
|
||||
- ch = char_type(*(++((unsigned char *)*inbuf)));
|
||||
+ ch = char_type(*(++*inbuf));
|
||||
(*inbytesleft) --;
|
||||
case utf7_printable:
|
||||
utf7_state[0] = 0;
|
||||
@@ -249,7 +249,7 @@
|
||||
(*inbytesleft) += needbytes;
|
||||
return UCS_CHAR_NONE;
|
||||
}
|
||||
- switch (char_type(*(++(unsigned char *)*inbuf))) {
|
||||
+ switch (char_type(*(++*inbuf))) {
|
||||
case utf7_shift_out:
|
||||
(*inbuf) ++;
|
||||
(*inbytesleft) -= 2;
|
||||
@@ -267,7 +267,7 @@
|
||||
return UCS_CHAR_INVALID;
|
||||
}
|
||||
(*inbytesleft) --;
|
||||
- return *((unsigned char *)*inbuf) ++;
|
||||
+ return *(*inbuf)++;
|
||||
#undef utf7_state
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user