diff options
Diffstat (limited to 'iconvdata')
346 files changed, 735 insertions, 663 deletions
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c index bc210260ec..d85d4ad6db 100644 --- a/iconvdata/8bit-gap.c +++ b/iconvdata/8bit-gap.c @@ -1,6 +1,6 @@ /* Generic conversion to and from 8bit charsets, converting from UCS using gaps. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -42,6 +42,7 @@ struct gap #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from the 8bit charset to UCS4. */ @@ -88,7 +89,7 @@ struct gap uint32_t ch = get32 (inptr); \ unsigned char res; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ rp = NULL; \ diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c index 20066aa500..56852c2443 100644 --- a/iconvdata/8bit-generic.c +++ b/iconvdata/8bit-generic.c @@ -1,5 +1,5 @@ /* Generic conversion to and from 8bit charsets. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -26,6 +26,7 @@ #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from the 8bit charset to UCS4. */ diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 5c2154e7bf..a3d1d09b69 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -20,6 +20,8 @@ # subdir := iconvdata +include ../Makeconfig + # Names of all the shared objects which implement the transformations. modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \ @@ -63,8 +65,6 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ modules.so := $(addsuffix .so, $(modules)) -include ../Makeconfig - ifeq (yes,$(build-shared)) tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 @@ -73,14 +73,8 @@ tests += bug-iconv3 endif test-srcs := tst-table-from tst-table-to - -bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata -tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata endif -# No code here is in libc.so. -CPPFLAGS += -DNOT_IN_libc - libJIS-routines := jis0201 jis0208 jis0212 libKSC-routines := ksc5601 libGB-routines := gb2312 @@ -177,9 +171,9 @@ gen-special-modules := iso8859-7jp generated-modules := $(gen-8bit-modules) $(gen-8bit-gap-modules) \ $(gen-special-modules) -generated = $(generated-modules:=.h) $(generated-modules:=.stmp) \ - iconv-test.out iconv-rules tst-loading.mtrace \ - mtrace-tst-loading tst-tables.out iconv-test.xxx +generated += $(generated-modules:=.h) $(generated-modules:=.stmp) \ + iconv-test.out iconv-rules tst-loading.mtrace \ + mtrace-tst-loading.out tst-tables.out iconv-test.xxx ifdef objpfx generated += gconv-modules endif @@ -202,7 +196,7 @@ touch $@ endef # The headers must be generated before the compilation. -before-compile = $(addprefix $(objpfx),$(generated-modules:=.h)) +before-compile += $(addprefix $(objpfx),$(generated-modules:=.h)) ifndef avoid-generated $(objpfx)iconv-rules: Makefile @@ -214,6 +208,7 @@ $(objpfx)iconv-rules: Makefile $(AWK) 'NR == 1 { \ for (i = 1; i <= NF; i++) { \ printf "%s-routines := %s\n", $$i, tolower($$i); \ + printf "libof-%s := iconvdata\n", tolower($$i); \ printf "%s-map := gconv.map\n", $$i; \ } \ }; \ @@ -254,8 +249,8 @@ ifeq (no,$(cross-compiling)) # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary # if this libc has more gconv modules than the previously installed one. if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \ - LC_ALL=C LANGUAGE=C \ - $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ + LC_ALL=C \ + $(rtld-prefix) \ $(common-objpfx)iconv/iconvconfig \ $(addprefix --prefix=,$(install_root)); \ fi @@ -265,20 +260,28 @@ endif endif # build-shared = yes -include ../Rules - ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) -tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out +tests-special += $(objpfx)iconv-test.out $(objpfx)tst-tables.out ifneq (no,$(PERL)) -tests: $(objpfx)mtrace-tst-loading +tests-special += $(objpfx)mtrace-tst-loading.out endif endif endif +include ../Rules + +# Set libof-* for each routine. +cpp-srcs-left := $(modules) $(generated-modules) $(libJIS-routines) \ + $(libKSC-routines) $(libGB-routines) $(libCNS-routines) \ + $(libISOIR165-routines) $(libJISX0213-routines) +lib := iconvdata +include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) + tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace -$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out - $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@ +$(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out + $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \ + $(evaluate-test) $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) @@ -299,13 +302,17 @@ $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \ $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ $(common-objdir)/iconv/iconv_prog TESTS - $(SHELL) $< $(common-objdir) '$(test-wrapper)' > $@ + iconv_modules="$(modules)" \ + $(SHELL) $< $(common-objdir) '$(test-wrapper-env)' \ + '$(run-program-env)' > $@; \ + $(evaluate-test) $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ $(objpfx)tst-table-from $(objpfx)tst-table-to $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \ - '$(test-program-prefix)' > $@ + '$(test-program-prefix)' > $@; \ + $(evaluate-test) do-tests-clean common-mostlyclean: tst-tables-clean diff --git a/iconvdata/TESTS b/iconvdata/TESTS index 3e273ec1b7..4a348e6c3b 100644 --- a/iconvdata/TESTS +++ b/iconvdata/TESTS @@ -1,5 +1,5 @@ # Available tests for iconv(1) (and therefore iconv(3)) in GNU libc. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. # diff --git a/iconvdata/TESTS2 b/iconvdata/TESTS2 index 05654af634..5c68a28cc4 100644 --- a/iconvdata/TESTS2 +++ b/iconvdata/TESTS2 @@ -1,5 +1,5 @@ # Tests for endianness dependent iconv(1) (and therefore iconv(3)) in GNU libc. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2001. # diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index 8b490d182a..da4911d220 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ANSI_X3.110-1983. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -390,6 +390,7 @@ static const char from_ucs4[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from ANSI_X3.110 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -567,7 +568,7 @@ static const char from_ucs4[][2] = /* Now test for a possible second byte and write this if possible. */ \ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ /* The result does not fit into the buffer. */ \ --outptr; \ diff --git a/iconvdata/armscii-8.c b/iconvdata/armscii-8.c index 8ad4dc4a7c..fd7ae7cfd6 100644 --- a/iconvdata/armscii-8.c +++ b/iconvdata/armscii-8.c @@ -1,5 +1,5 @@ /* Conversion to and from ARMSCII-8 - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -28,6 +28,7 @@ #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 static const uint16_t map_from_armscii_8[0xfe - 0xa2 + 1] = diff --git a/iconvdata/asmo_449.c b/iconvdata/asmo_449.c index 6af044eb24..d409fc2408 100644 --- a/iconvdata/asmo_449.c +++ b/iconvdata/asmo_449.c @@ -1,5 +1,5 @@ /* Conversion from and to ASMO_449. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/big5.c b/iconvdata/big5.c index 2a5887b1f0..166544939d 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -1,5 +1,5 @@ /* Mapping tables for Big5 handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -8383,6 +8383,7 @@ static const char from_ucs4_tab15[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from Big5 to UCS4. */ @@ -8401,7 +8402,7 @@ static const char from_ucs4_tab15[][2] = uint32_t ch2; \ int idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -8426,7 +8427,7 @@ static const char from_ucs4_tab15[][2] = ch = big5_to_ucs[idx]; \ \ /* Is this character defined? */ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c index 90a9bfcf89..fb962ca8be 100644 --- a/iconvdata/big5hkscs.c +++ b/iconvdata/big5hkscs.c @@ -1,5 +1,5 @@ /* Mapping tables for Big5-HKSCS handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Modified for Big5-HKSCS by Roger So <spacehunt@e-fever.org>, 2000. @@ -17738,6 +17738,7 @@ static struct #define TO_LOOP to_big5hkscs #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -17774,7 +17775,7 @@ static struct { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -17787,7 +17788,7 @@ static struct } \ else \ { \ - if (__builtin_expect (outbuf + 2 <= outend, 1)) \ + if (__glibc_likely (outbuf + 2 <= outend)) \ { \ /* Write out the last character. */ \ uint32_t lasttwo = data->__statep->__count >> 3; \ @@ -17814,7 +17815,7 @@ static struct \ /* Determine whether there is a buffered character pending. */ \ ch = *statep >> 3; \ - if (__builtin_expect (ch == 0, 1)) \ + if (__glibc_likely (ch == 0)) \ { \ /* No - so look at the next input byte. */ \ ch = *inptr; \ @@ -17826,7 +17827,7 @@ static struct uint32_t ch2; \ int idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -17887,7 +17888,7 @@ static struct \ inptr += 2; \ } \ - else if (__builtin_expect (ch == 0xff, 0)) \ + else if (__glibc_unlikely (ch == 0xff)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ @@ -17937,7 +17938,7 @@ static struct goto not_combining; \ \ /* Output the combined character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -17950,7 +17951,7 @@ static struct \ not_combining: \ /* Output the buffered character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -17992,7 +17993,7 @@ static struct else \ { \ /* Check for possible combining character. */ \ - if (__builtin_expect (ch == 0xca || ch == 0xea, 0)) \ + if (__glibc_unlikely (ch == 0xca || ch == 0xea)) \ { \ *statep = ((cp[0] << 8) | cp[1]) << 3; \ inptr += 4; \ @@ -18009,7 +18010,7 @@ static struct } \ \ *outptr++ = cp[0]; \ - if (__builtin_expect (cp[1] != '\0', 1)) \ + if (__glibc_likely (cp[1] != '\0')) \ *outptr++ = cp[1]; \ } \ } \ diff --git a/iconvdata/brf.c b/iconvdata/brf.c index d5763c39b6..89d346a524 100644 --- a/iconvdata/brf.c +++ b/iconvdata/brf.c @@ -1,5 +1,5 @@ /* Conversion from and to BRF. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Samuel Thibault <samuel.thibault@ens-lyon.org>, 2006. diff --git a/iconvdata/bug-iconv3.c b/iconvdata/bug-iconv3.c index 04b70c615e..18330e78d8 100644 --- a/iconvdata/bug-iconv3.c +++ b/iconvdata/bug-iconv3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. +/* Copyright (C) 2003-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. diff --git a/iconvdata/cns11643.c b/iconvdata/cns11643.c index f36a53556b..52b0e9877e 100644 --- a/iconvdata/cns11643.c +++ b/iconvdata/cns11643.c @@ -1,5 +1,5 @@ /* Mapping tables for CNS 11643, planes 2 to 7 handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h index ec88e64695..ab6ed98a1e 100644 --- a/iconvdata/cns11643.h +++ b/iconvdata/cns11643.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643 handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l1.c b/iconvdata/cns11643l1.c index 70dc3e0df6..78d97948e3 100644 --- a/iconvdata/cns11643l1.c +++ b/iconvdata/cns11643l1.c @@ -1,5 +1,5 @@ /* Mapping tables for CNS 11643, plane 1 handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l1.h b/iconvdata/cns11643l1.h index ef9f547e71..126a1446aa 100644 --- a/iconvdata/cns11643l1.h +++ b/iconvdata/cns11643l1.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 1 handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l2.h b/iconvdata/cns11643l2.h index 1779c791d3..481f95034c 100644 --- a/iconvdata/cns11643l2.h +++ b/iconvdata/cns11643l2.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 2 handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp10007.c b/iconvdata/cp10007.c index 8103abf852..e836d01c77 100644 --- a/iconvdata/cp10007.c +++ b/iconvdata/cp10007.c @@ -1,5 +1,5 @@ /* Conversion from and to CP10007 (MS MacCyrillic). - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/cp1125.c b/iconvdata/cp1125.c index 8c183e77d7..461ffdfdd1 100644 --- a/iconvdata/cp1125.c +++ b/iconvdata/cp1125.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1125. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/iconvdata/cp1250.c b/iconvdata/cp1250.c index 6e040214de..bb20da49cc 100644 --- a/iconvdata/cp1250.c +++ b/iconvdata/cp1250.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1250. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1251.c b/iconvdata/cp1251.c index 7824cf6b55..ea9307ddd6 100644 --- a/iconvdata/cp1251.c +++ b/iconvdata/cp1251.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1251. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1252.c b/iconvdata/cp1252.c index a4105d2b8a..2d72abbe25 100644 --- a/iconvdata/cp1252.c +++ b/iconvdata/cp1252.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1252. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1253.c b/iconvdata/cp1253.c index c6245242df..d2e21379b9 100644 --- a/iconvdata/cp1253.c +++ b/iconvdata/cp1253.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1253. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1254.c b/iconvdata/cp1254.c index d4feb3723d..9b4e408d3f 100644 --- a/iconvdata/cp1254.c +++ b/iconvdata/cp1254.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1254. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c index 9a05d3020c..5de7337c94 100644 --- a/iconvdata/cp1255.c +++ b/iconvdata/cp1255.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1255. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <haible@clisp.cons.org>, 2001. @@ -30,6 +30,7 @@ #define TO_LOOP to_cp1255 #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 1 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -65,7 +66,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -201,7 +202,7 @@ static const struct { unsigned int idx; unsigned int len; } comp_table[8] = { if (ch >= 0x80) \ { \ ch = to_ucs4[ch - 0x80]; \ - if (__builtin_expect (ch == L'\0', 0)) \ + if (__glibc_unlikely (ch == L'\0')) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -463,7 +464,7 @@ static const struct { res = 0; \ } \ \ - if (__builtin_expect (res != 0, 1)) \ + if (__glibc_likely (res != 0)) \ { \ *outptr++ = res; \ inptr += 4; \ @@ -515,7 +516,7 @@ static const struct { if (decomp_table[i].comb2 < 0) \ { \ /* See whether we have room for two bytes. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -527,7 +528,7 @@ static const struct { else \ { \ /* See whether we have room for three bytes. */ \ - if (__builtin_expect (outptr + 2 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 2 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/cp1256.c b/iconvdata/cp1256.c index 0c07422149..e6cec539d2 100644 --- a/iconvdata/cp1256.c +++ b/iconvdata/cp1256.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1256. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1257.c b/iconvdata/cp1257.c index 2349bb1082..b13b9b9b54 100644 --- a/iconvdata/cp1257.c +++ b/iconvdata/cp1257.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1257. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c index bafa28cc18..b2aef27a82 100644 --- a/iconvdata/cp1258.c +++ b/iconvdata/cp1258.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1258. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <haible@clisp.cons.org>, 2001. @@ -31,6 +31,7 @@ #define TO_LOOP to_cp1258 #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 1 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -66,7 +67,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -375,7 +376,7 @@ static const struct if (ch >= 0x80) \ { \ ch = to_ucs4[ch - 0x80]; \ - if (__builtin_expect (ch == L'\0', 0)) \ + if (__glibc_unlikely (ch == L'\0')) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -802,7 +803,7 @@ static const struct res = 0; \ } \ \ - if (__builtin_expect (res != 0, 1)) \ + if (__glibc_likely (res != 0)) \ { \ *outptr++ = res; \ inptr += 4; \ @@ -845,7 +846,7 @@ static const struct } \ \ /* See whether we have room for two bytes. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/cp737.c b/iconvdata/cp737.c index f9fcdbaadc..291ca705f4 100644 --- a/iconvdata/cp737.c +++ b/iconvdata/cp737.c @@ -1,5 +1,5 @@ /* Conversion from and to CP737. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp737.h b/iconvdata/cp737.h index dc6aa42fae..6a2265a526 100644 --- a/iconvdata/cp737.h +++ b/iconvdata/cp737.h @@ -1,5 +1,5 @@ /* Mapping table for CP737. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp770.c b/iconvdata/cp770.c index 6a7066e87c..2e8cf64cef 100644 --- a/iconvdata/cp770.c +++ b/iconvdata/cp770.c @@ -1,5 +1,5 @@ /* Conversion from and to CP770. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp771.c b/iconvdata/cp771.c index edbaa2408a..57b4227caf 100644 --- a/iconvdata/cp771.c +++ b/iconvdata/cp771.c @@ -1,5 +1,5 @@ /* Conversion from and to CP771. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp772.c b/iconvdata/cp772.c index 10736164fc..3c553418e3 100644 --- a/iconvdata/cp772.c +++ b/iconvdata/cp772.c @@ -1,5 +1,5 @@ /* Conversion from and to CP772. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp773.c b/iconvdata/cp773.c index 7dc54708c2..feb92cda08 100644 --- a/iconvdata/cp773.c +++ b/iconvdata/cp773.c @@ -1,5 +1,5 @@ /* Conversion from and to CP773. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp774.c b/iconvdata/cp774.c index 7d99d18995..7880b840e5 100644 --- a/iconvdata/cp774.c +++ b/iconvdata/cp774.c @@ -1,5 +1,5 @@ /* Conversion from and to CP774. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp775.c b/iconvdata/cp775.c index cc8dd0c603..c0cfb844a7 100644 --- a/iconvdata/cp775.c +++ b/iconvdata/cp775.c @@ -1,5 +1,5 @@ /* Conversion from and to CP775. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp775.h b/iconvdata/cp775.h index 8d54e0f288..97f97f594f 100644 --- a/iconvdata/cp775.h +++ b/iconvdata/cp775.h @@ -1,5 +1,5 @@ /* Mapping table for CP775. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp932.c b/iconvdata/cp932.c index b8269ac061..f157ca2087 100644 --- a/iconvdata/cp932.c +++ b/iconvdata/cp932.c @@ -1,5 +1,5 @@ /* Mapping tables for CP932 handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp>, 2003. @@ -4534,6 +4534,7 @@ static const char from_ucs4_extra[229][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from CP932 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -4574,7 +4575,7 @@ static const char from_ucs4_extra[229][2] = uint32_t ch2; \ uint_fast32_t idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -4704,7 +4705,7 @@ static const char from_ucs4_extra[229][2] = /* Now test for a possible second byte and write this if possible. */\ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ /* The result does not fit into the buffer. */ \ result = __GCONV_FULL_OUTPUT; \ diff --git a/iconvdata/csn_369103.c b/iconvdata/csn_369103.c index 6594676b5a..ac52b49b77 100644 --- a/iconvdata/csn_369103.c +++ b/iconvdata/csn_369103.c @@ -1,5 +1,5 @@ /* Conversion from and to CSN_369103. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cwi.c b/iconvdata/cwi.c index 12872a0a3b..3fb154d63e 100644 --- a/iconvdata/cwi.c +++ b/iconvdata/cwi.c @@ -1,5 +1,5 @@ /* Conversion from and to CWI. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/dec-mcs.c b/iconvdata/dec-mcs.c index 4c325e8220..379ea35fdf 100644 --- a/iconvdata/dec-mcs.c +++ b/iconvdata/dec-mcs.c @@ -1,5 +1,5 @@ /* Conversion from and to DEC-MCS. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-at-de-a.c b/iconvdata/ebcdic-at-de-a.c index 9fe0c523da..9f7f8a1d19 100644 --- a/iconvdata/ebcdic-at-de-a.c +++ b/iconvdata/ebcdic-at-de-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-AT-DE-A. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-at-de.c b/iconvdata/ebcdic-at-de.c index 0e47917817..d50524db9b 100644 --- a/iconvdata/ebcdic-at-de.c +++ b/iconvdata/ebcdic-at-de.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-AT-DE. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-ca-fr.c b/iconvdata/ebcdic-ca-fr.c index 5f7cf24210..8afbf1cbc4 100644 --- a/iconvdata/ebcdic-ca-fr.c +++ b/iconvdata/ebcdic-ca-fr.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-CA-FR. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-dk-no-a.c b/iconvdata/ebcdic-dk-no-a.c index 36973027fa..2fa41f968c 100644 --- a/iconvdata/ebcdic-dk-no-a.c +++ b/iconvdata/ebcdic-dk-no-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-DK-NO-A. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-dk-no.c b/iconvdata/ebcdic-dk-no.c index f8ba962ea6..5ec7c7246a 100644 --- a/iconvdata/ebcdic-dk-no.c +++ b/iconvdata/ebcdic-dk-no.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-DK-NO. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es-a.c b/iconvdata/ebcdic-es-a.c index b93b754585..70176c3206 100644 --- a/iconvdata/ebcdic-es-a.c +++ b/iconvdata/ebcdic-es-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES-A. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es-s.c b/iconvdata/ebcdic-es-s.c index 4ae3e96e36..4c2f693c64 100644 --- a/iconvdata/ebcdic-es-s.c +++ b/iconvdata/ebcdic-es-s.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES-S. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es.c b/iconvdata/ebcdic-es.c index 068eb68c98..023f58baeb 100644 --- a/iconvdata/ebcdic-es.c +++ b/iconvdata/ebcdic-es.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fi-se-a.c b/iconvdata/ebcdic-fi-se-a.c index bd2b8d9ae3..b49858115a 100644 --- a/iconvdata/ebcdic-fi-se-a.c +++ b/iconvdata/ebcdic-fi-se-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FI-SE-A. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fi-se.c b/iconvdata/ebcdic-fi-se.c index 2177a8e889..809f6e0e33 100644 --- a/iconvdata/ebcdic-fi-se.c +++ b/iconvdata/ebcdic-fi-se.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FI-SE. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fr.c b/iconvdata/ebcdic-fr.c index 2a3bd8a287..331b9ac322 100644 --- a/iconvdata/ebcdic-fr.c +++ b/iconvdata/ebcdic-fr.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FR. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-is-friss.c b/iconvdata/ebcdic-is-friss.c index 3d8438bc97..93ff302ced 100644 --- a/iconvdata/ebcdic-is-friss.c +++ b/iconvdata/ebcdic-is-friss.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-IS-FRISS. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-it.c b/iconvdata/ebcdic-it.c index 1fd4819a0b..caee03cb99 100644 --- a/iconvdata/ebcdic-it.c +++ b/iconvdata/ebcdic-it.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-IT. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-pt.c b/iconvdata/ebcdic-pt.c index 6d9e46cb50..e10b931270 100644 --- a/iconvdata/ebcdic-pt.c +++ b/iconvdata/ebcdic-pt.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-PT. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-uk.c b/iconvdata/ebcdic-uk.c index 4418afe770..a168762705 100644 --- a/iconvdata/ebcdic-uk.c +++ b/iconvdata/ebcdic-uk.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-UK. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-us.c b/iconvdata/ebcdic-us.c index 9481af579a..5ae18866cd 100644 --- a/iconvdata/ebcdic-us.c +++ b/iconvdata/ebcdic-us.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-US. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ecma-cyrillic.c b/iconvdata/ecma-cyrillic.c index 25f7a82e12..8cdd1af3d9 100644 --- a/iconvdata/ecma-cyrillic.c +++ b/iconvdata/ecma-cyrillic.c @@ -1,5 +1,5 @@ /* Conversion from and to ECMA-CYRILLIC. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c index 0b8a74b706..6fb2d54512 100644 --- a/iconvdata/euc-cn.c +++ b/iconvdata/euc-cn.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-CN handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -30,6 +30,7 @@ #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from EUC-CN to UCS4. */ @@ -56,7 +57,7 @@ next byte is also available. */ \ const unsigned char *endp; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -67,14 +68,14 @@ ch = inptr[1]; \ \ /* All second bytes of a multibyte character must be >= 0xa1. */ \ - if (__builtin_expect (ch < 0xa1, 0)) \ + if (__glibc_unlikely (ch < 0xa1)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ /* This is code set 1: GB 2312-80. */ \ endp = inptr; \ \ ch = gb2312_to_ucs4 (&endp, 2, 0x80); \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ diff --git a/iconvdata/euc-jisx0213.c b/iconvdata/euc-jisx0213.c index 2737842de1..8fb0ded8ff 100644 --- a/iconvdata/euc-jisx0213.c +++ b/iconvdata/euc-jisx0213.c @@ -1,5 +1,5 @@ /* Conversion from and to EUC-JISX0213. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. @@ -43,6 +43,7 @@ #define TO_LOOP to_euc_jisx0213 #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 3 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -79,7 +80,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -92,7 +93,7 @@ } \ else \ { \ - if (__builtin_expect (outbuf + 2 <= outend, 1)) \ + if (__glibc_likely (outbuf + 2 <= outend)) \ { \ /* Write out the last character. */ \ uint32_t lasttwo = data->__statep->__count >> 3; \ @@ -119,7 +120,7 @@ \ /* Determine whether there is a buffered character pending. */ \ ch = *statep >> 3; \ - if (__builtin_expect (ch == 0, 1)) \ + if (__glibc_likely (ch == 0)) \ { \ /* No - so look at the next input byte. */ \ ch = *inptr; \ @@ -132,7 +133,7 @@ /* Two or three byte character. */ \ uint32_t ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second byte is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -142,7 +143,7 @@ ch2 = inptr[1]; \ \ /* The second byte must be >= 0xa1 and <= 0xfe. */ \ - if (__builtin_expect (ch2 < 0xa1 || ch2 > 0xfe, 0)) \ + if (__glibc_unlikely (ch2 < 0xa1 || ch2 > 0xfe)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -151,7 +152,7 @@ if (ch == 0x8e) \ { \ /* Half-width katakana. */ \ - if (__builtin_expect (ch2 > 0xdf, 0)) \ + if (__glibc_unlikely (ch2 > 0xdf)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ ch = ch2 + 0xfec0; \ @@ -166,7 +167,7 @@ /* JISX 0213 plane 2. */ \ uint32_t ch3; \ \ - if (__builtin_expect (inptr + 2 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 2 >= inend)) \ { \ /* The third byte is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -323,7 +324,7 @@ static const struct if (len > 0) \ { \ /* Output the combined character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -338,7 +339,7 @@ static const struct \ not_combining: \ /* Output the buffered character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -355,7 +356,7 @@ static const struct else if (ch >= 0xff61 && ch <= 0xff9f) \ { \ /* Half-width katakana. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -389,7 +390,7 @@ static const struct if (jch & 0x8000) \ { \ /* JISX 0213 plane 2. */ \ - if (__builtin_expect (outptr + 2 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 2 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -399,7 +400,7 @@ static const struct else \ { \ /* JISX 0213 plane 1. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/euc-jp-ms.c b/iconvdata/euc-jp-ms.c index 5ec40ad6cc..375be48569 100644 --- a/iconvdata/euc-jp-ms.c +++ b/iconvdata/euc-jp-ms.c @@ -1,5 +1,5 @@ /* Mapping tables for EUCJP-MS handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp>, 2003. @@ -4641,6 +4641,7 @@ static const unsigned char from_ucs4_extra[229][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 3 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from EUC-JP-MS to UCS4. */ @@ -4673,7 +4674,7 @@ static const unsigned char from_ucs4_extra[229][2] = character is also available. */ \ unsigned char ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -4684,7 +4685,7 @@ static const unsigned char from_ucs4_extra[229][2] = ch2 = (unsigned char)inptr[1]; \ \ /* All second bytes of a multibyte character must be >= 0xa1. */ \ - if (__builtin_expect (ch2 < 0xa1, 0)) \ + if (__glibc_unlikely (ch2 < 0xa1)) \ { \ /* This is an illegal character. */ \ if (! ignore_errors_p ()) \ @@ -4703,7 +4704,7 @@ static const unsigned char from_ucs4_extra[229][2] = /* This is code set 2: half-width katakana. */ \ ch = jisx0201_to_ucs4 (ch2); \ /*if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR)*/ \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ /* Illegal character. */ \ if (! ignore_errors_p ()) \ @@ -4896,15 +4897,15 @@ static const unsigned char from_ucs4_extra[229][2] = /* Now test for a possible second byte and write this if possible. */\ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ /* The result does not fit into the buffer. */ \ result = __GCONV_FULL_OUTPUT; \ break; \ } \ - if (__builtin_expect (cp[1] < 0x80, 0)) \ + if (__glibc_unlikely (cp[1] < 0x80)) \ { \ - if (__builtin_expect (outptr + 2 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 2 >= outend)) \ { \ /* The result does not fit into the buffer. */ \ result = __GCONV_FULL_OUTPUT; \ diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c index b903091ff7..0945554443 100644 --- a/iconvdata/euc-jp.c +++ b/iconvdata/euc-jp.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-JP handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -33,6 +33,7 @@ #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 3 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from EUC-JP to UCS4. */ @@ -57,7 +58,7 @@ byte is also available. */ \ int ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second byte is not available. Store the \ intermediate result. */ \ @@ -68,7 +69,7 @@ ch2 = inptr[1]; \ \ /* All second bytes of a multibyte character must be >= 0xa1. */ \ - if (__builtin_expect (ch2 < 0xa1, 0)) \ + if (__glibc_unlikely (ch2 < 0xa1)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ if (ch == 0x8e) \ @@ -105,7 +106,7 @@ result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ /* Illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ @@ -151,7 +152,7 @@ size_t found; \ \ /* See whether we have room for at least two characters. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c index d4f0e00ca4..552b8f5411 100644 --- a/iconvdata/euc-kr.c +++ b/iconvdata/euc-kr.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-KR handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu> and Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -66,6 +66,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from EUC-KR to UCS4. */ @@ -93,13 +94,13 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) /* Two-byte character. First test whether the next byte \ is also available. */ \ ch = ksc5601_to_ucs4 (&inptr, inend - inptr, 0x80); \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* The second byte is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ } \ @@ -144,7 +145,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) /* Now test for a possible second byte and write this if possible. */ \ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ /* The result does not fit into the buffer. */ \ --outptr; \ diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c index 58ad6f1f8b..23f4cce3da 100644 --- a/iconvdata/euc-tw.c +++ b/iconvdata/euc-tw.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-TW handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -31,6 +31,7 @@ #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 4 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from EUC-TW to UCS4. */ diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c index 4302fbf817..3588712bde 100644 --- a/iconvdata/gb18030.c +++ b/iconvdata/gb18030.c @@ -1,5 +1,5 @@ /* Mapping tables for GBK handling. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Sean Chen <seanc@turbolinux.com.cn>, 1999. @@ -24107,6 +24107,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 4 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from GB18030 to UCS4. */ @@ -24212,7 +24213,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] = \ inptr += 4; \ } \ - else if (__builtin_expect (ch2 >= 0x40, 1)) \ + else if (__glibc_likely (ch2 >= 0x40)) \ { \ /* A two-byte character */ \ idx = (ch - 0x81) * 192 + (ch2 - 0x40); \ @@ -24375,7 +24376,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] = { \ /* See whether there is enough room for all four bytes we \ write. */ \ - if (__builtin_expect (outptr + 3 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 3 >= outend)) \ { \ /* We have not enough room. */ \ result = __GCONV_FULL_OUTPUT; \ diff --git a/iconvdata/gb2312.c b/iconvdata/gb2312.c index cef756c2e1..caba67ee25 100644 --- a/iconvdata/gb2312.c +++ b/iconvdata/gb2312.c @@ -1,5 +1,5 @@ /* GB 2312 conversion tables. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/gb2312.h b/iconvdata/gb2312.h index e516c792b3..29804b5746 100644 --- a/iconvdata/gb2312.h +++ b/iconvdata/gb2312.h @@ -1,5 +1,5 @@ /* Access functions for GB2312 conversion. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/gbbig5.c b/iconvdata/gbbig5.c index 9a68c5cc7d..25fe38de71 100644 --- a/iconvdata/gbbig5.c +++ b/iconvdata/gbbig5.c @@ -1,5 +1,5 @@ /* Mapping tables from GB2312 to BIG5 and vice versa. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -4784,6 +4784,7 @@ const char __from_big5_to_gb2312 [13973][2] = #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 1 #define MAX_NEEDED_TO 2 +#define ONE_DIRECTION 0 /* First define the conversion function from GB2312 to BIG5. */ @@ -4805,7 +4806,7 @@ const char __from_big5_to_gb2312 [13973][2] = const char *cp; \ int idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -4817,7 +4818,7 @@ const char __from_big5_to_gb2312 [13973][2] = ch = inptr[1]; \ \ /* All second bytes of a multibyte character must be >= 0xa1. */ \ - if (__builtin_expect (ch < 0xa1, 0)) \ + if (__glibc_unlikely (ch < 0xa1)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -4827,7 +4828,7 @@ const char __from_big5_to_gb2312 [13973][2] = \ /* Get the value from the table. */ \ cp = __from_gb2312_to_big5[idx]; \ - if (__builtin_expect (cp[0] == '\0', 0)) \ + if (__glibc_unlikely (cp[0] == '\0')) \ { \ /* We do not have a mapping for this character. \ If ignore errors, map it to 0xa1bc - big5 box character */ \ @@ -4836,7 +4837,7 @@ const char __from_big5_to_gb2312 [13973][2] = break; \ \ /* See if there is enough room to write the second byte. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -4894,7 +4895,7 @@ const char __from_big5_to_gb2312 [13973][2] = const char *cp; \ int idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -4918,7 +4919,7 @@ const char __from_big5_to_gb2312 [13973][2] = \ /* Get the value from the table. */ \ cp = __from_big5_to_gb2312 [idx]; \ - if (__builtin_expect (cp[0] == '\0', 0)) \ + if (__glibc_unlikely (cp[0] == '\0')) \ { \ /* We do not have a mapping for this character. \ If ignore errors, map it to 0xa1f5 - gb box character */ \ @@ -4927,7 +4928,7 @@ const char __from_big5_to_gb2312 [13973][2] = break; \ \ /* See if there is enough room to write the second byte. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c index b870d9d8fb..8473999dc9 100644 --- a/iconvdata/gbgbk.c +++ b/iconvdata/gbgbk.c @@ -1,5 +1,5 @@ /* Mapping tables from GBK to GB2312 and vice versa. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -32,6 +32,7 @@ #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 1 #define MAX_NEEDED_TO 2 +#define ONE_DIRECTION 0 /* First define the conversion function from GBK to GB2312. */ @@ -73,7 +74,7 @@ UCS4 -> GB2312 -> GBK -> UCS4 \ \ might not produce identical text. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -81,7 +82,7 @@ break; \ } \ \ - if (__builtin_expect (outend - outptr < 2, 0)) \ + if (__glibc_unlikely (outend - outptr < 2)) \ { \ /* We ran out of space. */ \ result = __GCONV_FULL_OUTPUT; \ @@ -91,7 +92,7 @@ ch = (ch << 8) | inptr[1]; \ \ /* Map 0xA844 (U2015 in GBK) to 0xA1AA (U2015 in GB2312). */ \ - if (__builtin_expect (ch == 0xa844, 0)) \ + if (__glibc_unlikely (ch == 0xa844)) \ ch = 0xa1aa; \ \ /* Now determine whether the character is valid. */ \ @@ -134,7 +135,7 @@ \ if (ch > 0x7f) \ { \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -142,7 +143,7 @@ break; \ } \ \ - if (__builtin_expect (outend - outptr < 2, 0)) \ + if (__glibc_unlikely (outend - outptr < 2)) \ { \ /* We ran out of space. */ \ result = __GCONV_FULL_OUTPUT; \ diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index 2f7d7fb886..f838dc11f1 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -1,5 +1,5 @@ /* Mapping tables for GBK handling. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Sean Chen <sean.chen@turbolinux.com>, 1999. @@ -13130,6 +13130,7 @@ static const char __gbk_from_ucs4_tab12[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from GBK to UCS4. */ @@ -13157,7 +13158,7 @@ static const char __gbk_from_ucs4_tab12[][2] = uint32_t ch2; \ int idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index d3631c0bf4..2e7b03d3b5 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -1630,13 +1630,6 @@ module IBM1155// INTERNAL IBM1155 1 module INTERNAL IBM1155// IBM1155 1 # from to module cost -alias IBM-1155// IBM1155// -alias CP1155// IBM1155// -alias CSIBM1155// IBM1155// -module IBM1155// INTERNAL IBM1155 1 -module INTERNAL IBM1155// IBM1155 1 - -# from to module cost alias IBM-1156// IBM1156// alias CP1156// IBM1156// alias CSIBM1156// IBM1156// diff --git a/iconvdata/georgian-academy.c b/iconvdata/georgian-academy.c index 91ed0ff4ab..d31792a42b 100644 --- a/iconvdata/georgian-academy.c +++ b/iconvdata/georgian-academy.c @@ -1,5 +1,5 @@ /* Conversion from and to GEORGIAN-ACADEMY. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/georgian-ps.c b/iconvdata/georgian-ps.c index 89840e9cb0..58fe929d9c 100644 --- a/iconvdata/georgian-ps.c +++ b/iconvdata/georgian-ps.c @@ -1,5 +1,5 @@ /* Conversion from and to GEORGIAN-PS. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/gost_19768-74.c b/iconvdata/gost_19768-74.c index c4054a2b1e..2349fe0c13 100644 --- a/iconvdata/gost_19768-74.c +++ b/iconvdata/gost_19768-74.c @@ -1,5 +1,5 @@ /* Conversion from and to GOST_19768-74. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek-ccitt.c b/iconvdata/greek-ccitt.c index 061e57a8c4..d6791825c9 100644 --- a/iconvdata/greek-ccitt.c +++ b/iconvdata/greek-ccitt.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK-CCITT. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek7-old.c b/iconvdata/greek7-old.c index 6e135abb5f..97dd345224 100644 --- a/iconvdata/greek7-old.c +++ b/iconvdata/greek7-old.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK7-OLD. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek7.c b/iconvdata/greek7.c index 89ac166dfe..7a46269925 100644 --- a/iconvdata/greek7.c +++ b/iconvdata/greek7.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK7. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/hp-greek8.c b/iconvdata/hp-greek8.c index df1d77207d..d3072657e4 100644 --- a/iconvdata/hp-greek8.c +++ b/iconvdata/hp-greek8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-GREEK8. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-roman8.c b/iconvdata/hp-roman8.c index f5e586ef08..9efc2eeb88 100644 --- a/iconvdata/hp-roman8.c +++ b/iconvdata/hp-roman8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN8. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/hp-roman9.c b/iconvdata/hp-roman9.c index 51114f5a88..9072547202 100644 --- a/iconvdata/hp-roman9.c +++ b/iconvdata/hp-roman9.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN9. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-thai8.c b/iconvdata/hp-thai8.c index c757a6a249..9833e98ddc 100644 --- a/iconvdata/hp-thai8.c +++ b/iconvdata/hp-thai8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-THAI8. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-turkish8.c b/iconvdata/hp-turkish8.c index 732e9d389e..77e5caa44f 100644 --- a/iconvdata/hp-turkish8.c +++ b/iconvdata/hp-turkish8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-TURKISH8. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/ibm037.c b/iconvdata/ibm037.c index bff8e1e26d..994de271d3 100644 --- a/iconvdata/ibm037.c +++ b/iconvdata/ibm037.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM037. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm038.c b/iconvdata/ibm038.c index eaf5ff2c88..980994297d 100644 --- a/iconvdata/ibm038.c +++ b/iconvdata/ibm038.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM038. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1004.c b/iconvdata/ibm1004.c index f92de24312..bd91b108e5 100644 --- a/iconvdata/ibm1004.c +++ b/iconvdata/ibm1004.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1004. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1008.c b/iconvdata/ibm1008.c index 7404448f43..af769e76c8 100644 --- a/iconvdata/ibm1008.c +++ b/iconvdata/ibm1008.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1008. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1008.h b/iconvdata/ibm1008.h index 5c08f2fad7..ceddbd09e1 100644 --- a/iconvdata/ibm1008.h +++ b/iconvdata/ibm1008.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1008. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1008_420.c b/iconvdata/ibm1008_420.c index 8a99964fd5..55af8d26c1 100644 --- a/iconvdata/ibm1008_420.c +++ b/iconvdata/ibm1008_420.c @@ -1,5 +1,5 @@ /* Mapping tables from IBM1008 to IBM420 and vice versa. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1025.c b/iconvdata/ibm1025.c index 9cf1d213da..22145cc04e 100644 --- a/iconvdata/ibm1025.c +++ b/iconvdata/ibm1025.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1025. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1025.h b/iconvdata/ibm1025.h index 76827019f6..e4030c203b 100644 --- a/iconvdata/ibm1025.h +++ b/iconvdata/ibm1025.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1025. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1026.c b/iconvdata/ibm1026.c index edbfc02640..921e46c3d7 100644 --- a/iconvdata/ibm1026.c +++ b/iconvdata/ibm1026.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1026. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1046.c b/iconvdata/ibm1046.c index 44695bf6d0..d773bf543f 100644 --- a/iconvdata/ibm1046.c +++ b/iconvdata/ibm1046.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1046. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm1046.h b/iconvdata/ibm1046.h index c2fe6e49c5..ad2856e577 100644 --- a/iconvdata/ibm1046.h +++ b/iconvdata/ibm1046.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1046. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm1047.c b/iconvdata/ibm1047.c index 41a68688a8..304d4c9261 100644 --- a/iconvdata/ibm1047.c +++ b/iconvdata/ibm1047.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1047. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1097.c b/iconvdata/ibm1097.c index e836d23bba..8591f7fb34 100644 --- a/iconvdata/ibm1097.c +++ b/iconvdata/ibm1097.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1097. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1097.h b/iconvdata/ibm1097.h index 3469ca1e8c..9ad653c526 100644 --- a/iconvdata/ibm1097.h +++ b/iconvdata/ibm1097.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1097. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1112.c b/iconvdata/ibm1112.c index 05fa81b771..3d552a3c3e 100644 --- a/iconvdata/ibm1112.c +++ b/iconvdata/ibm1112.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1112. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1112.h b/iconvdata/ibm1112.h index 3b8e916a18..87cb54d656 100644 --- a/iconvdata/ibm1112.h +++ b/iconvdata/ibm1112.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1112. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1122.c b/iconvdata/ibm1122.c index 4bc138b9da..8a33c23219 100644 --- a/iconvdata/ibm1122.c +++ b/iconvdata/ibm1122.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1122. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1122.h b/iconvdata/ibm1122.h index aa864862eb..a8be395277 100644 --- a/iconvdata/ibm1122.h +++ b/iconvdata/ibm1122.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1122. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1123.c b/iconvdata/ibm1123.c index 26c5a72990..7b6a90ff74 100644 --- a/iconvdata/ibm1123.c +++ b/iconvdata/ibm1123.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1123. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1123.h b/iconvdata/ibm1123.h index 68ee4f8858..6912c000b5 100644 --- a/iconvdata/ibm1123.h +++ b/iconvdata/ibm1123.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1123. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1124.c b/iconvdata/ibm1124.c index 6474496184..73d283a51e 100644 --- a/iconvdata/ibm1124.c +++ b/iconvdata/ibm1124.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1124. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1124.h b/iconvdata/ibm1124.h index 8191f5f06a..699f745335 100644 --- a/iconvdata/ibm1124.h +++ b/iconvdata/ibm1124.h @@ -1,5 +1,5 @@ /* Conversion from and to IBM1124. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1129.c b/iconvdata/ibm1129.c index be1866e66a..7b91bf8145 100644 --- a/iconvdata/ibm1129.c +++ b/iconvdata/ibm1129.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1129. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1129.h b/iconvdata/ibm1129.h index 6960e92d48..138f759d88 100644 --- a/iconvdata/ibm1129.h +++ b/iconvdata/ibm1129.h @@ -1,5 +1,5 @@ /* Conversion from and to IBM1129. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1130.c b/iconvdata/ibm1130.c index c093655b7d..e1620bbe0b 100644 --- a/iconvdata/ibm1130.c +++ b/iconvdata/ibm1130.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1130. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1130.h b/iconvdata/ibm1130.h index bea0a3389e..cfcf8bd466 100644 --- a/iconvdata/ibm1130.h +++ b/iconvdata/ibm1130.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1130. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1132.c b/iconvdata/ibm1132.c index c4e62f2a08..91a486a675 100644 --- a/iconvdata/ibm1132.c +++ b/iconvdata/ibm1132.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1132. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1132.h b/iconvdata/ibm1132.h index 56b0857011..0e5320dbbf 100644 --- a/iconvdata/ibm1132.h +++ b/iconvdata/ibm1132.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1132. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1133.c b/iconvdata/ibm1133.c index f5e24d5a95..324c296cf3 100644 --- a/iconvdata/ibm1133.c +++ b/iconvdata/ibm1133.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1133. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1133.h b/iconvdata/ibm1133.h index 61f1e5427b..a8c2aa1af1 100644 --- a/iconvdata/ibm1133.h +++ b/iconvdata/ibm1133.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1133. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1137.c b/iconvdata/ibm1137.c index cada0cab51..eaadd493a6 100644 --- a/iconvdata/ibm1137.c +++ b/iconvdata/ibm1137.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1137. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1137.h b/iconvdata/ibm1137.h index 39ad61ba88..dcc968fa41 100644 --- a/iconvdata/ibm1137.h +++ b/iconvdata/ibm1137.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1137. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1140.c b/iconvdata/ibm1140.c index f7ebe7b8eb..ba4bc5735e 100644 --- a/iconvdata/ibm1140.c +++ b/iconvdata/ibm1140.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1140. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1140.h b/iconvdata/ibm1140.h index 9888b45d5c..59e15e0c99 100644 --- a/iconvdata/ibm1140.h +++ b/iconvdata/ibm1140.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1140. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1141.c b/iconvdata/ibm1141.c index e2a5273c0b..369e1db22a 100644 --- a/iconvdata/ibm1141.c +++ b/iconvdata/ibm1141.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1141. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1141.h b/iconvdata/ibm1141.h index 7707563be6..6c6310e15d 100644 --- a/iconvdata/ibm1141.h +++ b/iconvdata/ibm1141.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1141. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1142.c b/iconvdata/ibm1142.c index 9807dde03f..cf3bab84fa 100644 --- a/iconvdata/ibm1142.c +++ b/iconvdata/ibm1142.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1142. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1142.h b/iconvdata/ibm1142.h index abe7a78c5e..8cac172a7b 100644 --- a/iconvdata/ibm1142.h +++ b/iconvdata/ibm1142.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1142. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1143.c b/iconvdata/ibm1143.c index e14ed1d351..d8ead5934d 100644 --- a/iconvdata/ibm1143.c +++ b/iconvdata/ibm1143.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1143. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1143.h b/iconvdata/ibm1143.h index 3b1bef497b..0937b09320 100644 --- a/iconvdata/ibm1143.h +++ b/iconvdata/ibm1143.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1143. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1144.c b/iconvdata/ibm1144.c index 27696e5add..7eb834f126 100644 --- a/iconvdata/ibm1144.c +++ b/iconvdata/ibm1144.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1144. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1144.h b/iconvdata/ibm1144.h index 424c5df8f6..c15dd6817b 100644 --- a/iconvdata/ibm1144.h +++ b/iconvdata/ibm1144.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1144. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1145.c b/iconvdata/ibm1145.c index 9565d520d2..7b2dab3ffa 100644 --- a/iconvdata/ibm1145.c +++ b/iconvdata/ibm1145.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1145. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1145.h b/iconvdata/ibm1145.h index b8448725e0..a4c30e9beb 100644 --- a/iconvdata/ibm1145.h +++ b/iconvdata/ibm1145.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1145. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1146.c b/iconvdata/ibm1146.c index 53586ba4ae..0b406c6832 100644 --- a/iconvdata/ibm1146.c +++ b/iconvdata/ibm1146.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1146. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1146.h b/iconvdata/ibm1146.h index c42dbf2930..2bbabe4c01 100644 --- a/iconvdata/ibm1146.h +++ b/iconvdata/ibm1146.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1146. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1147.c b/iconvdata/ibm1147.c index 66348b3ced..60e3e931f1 100644 --- a/iconvdata/ibm1147.c +++ b/iconvdata/ibm1147.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1147. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1147.h b/iconvdata/ibm1147.h index e927429597..d1b4a4cbd7 100644 --- a/iconvdata/ibm1147.h +++ b/iconvdata/ibm1147.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1147. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1148.c b/iconvdata/ibm1148.c index 6ddbeea7d0..52e35ff5bf 100644 --- a/iconvdata/ibm1148.c +++ b/iconvdata/ibm1148.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1148. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1148.h b/iconvdata/ibm1148.h index c138ac3c83..2bd6fc3b0c 100644 --- a/iconvdata/ibm1148.h +++ b/iconvdata/ibm1148.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1148. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1149.c b/iconvdata/ibm1149.c index 9cd63cfe6b..f20f827617 100644 --- a/iconvdata/ibm1149.c +++ b/iconvdata/ibm1149.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1149. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1149.h b/iconvdata/ibm1149.h index 8f351eff3a..d733dc8d53 100644 --- a/iconvdata/ibm1149.h +++ b/iconvdata/ibm1149.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1149. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1153.c b/iconvdata/ibm1153.c index 7513932738..17a423ce7b 100644 --- a/iconvdata/ibm1153.c +++ b/iconvdata/ibm1153.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1153. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1153.h b/iconvdata/ibm1153.h index 31b7d144a2..0d701e7a7b 100644 --- a/iconvdata/ibm1153.h +++ b/iconvdata/ibm1153.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1153. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1154.c b/iconvdata/ibm1154.c index b6511806bd..07b4088728 100644 --- a/iconvdata/ibm1154.c +++ b/iconvdata/ibm1154.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1154. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1154.h b/iconvdata/ibm1154.h index 8f557bb549..7bbd7da905 100644 --- a/iconvdata/ibm1154.h +++ b/iconvdata/ibm1154.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1154. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1155.c b/iconvdata/ibm1155.c index 500e2fee76..38a68ba6f9 100644 --- a/iconvdata/ibm1155.c +++ b/iconvdata/ibm1155.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1155. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1155.h b/iconvdata/ibm1155.h index 67a994e609..ded7556563 100644 --- a/iconvdata/ibm1155.h +++ b/iconvdata/ibm1155.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1155. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1156.c b/iconvdata/ibm1156.c index 06cc0b6870..353e8c5afb 100644 --- a/iconvdata/ibm1156.c +++ b/iconvdata/ibm1156.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1156. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1156.h b/iconvdata/ibm1156.h index 453b0b68bd..503e0f0021 100644 --- a/iconvdata/ibm1156.h +++ b/iconvdata/ibm1156.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1156. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1157.c b/iconvdata/ibm1157.c index 5f92373c20..b7fcf01d74 100644 --- a/iconvdata/ibm1157.c +++ b/iconvdata/ibm1157.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1157. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1157.h b/iconvdata/ibm1157.h index d9654ff59f..ad333127a6 100644 --- a/iconvdata/ibm1157.h +++ b/iconvdata/ibm1157.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1157. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1158.c b/iconvdata/ibm1158.c index f4a5665248..fba3362a65 100644 --- a/iconvdata/ibm1158.c +++ b/iconvdata/ibm1158.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1158. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1158.h b/iconvdata/ibm1158.h index 3383defe6c..444a939d58 100644 --- a/iconvdata/ibm1158.h +++ b/iconvdata/ibm1158.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1158. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1160.c b/iconvdata/ibm1160.c index 27e65aa76a..45396b227f 100644 --- a/iconvdata/ibm1160.c +++ b/iconvdata/ibm1160.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1160. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1160.h b/iconvdata/ibm1160.h index d396ecb686..d9a93f2243 100644 --- a/iconvdata/ibm1160.h +++ b/iconvdata/ibm1160.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1160. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1161.c b/iconvdata/ibm1161.c index 305ecfd6ff..e024ab28a6 100644 --- a/iconvdata/ibm1161.c +++ b/iconvdata/ibm1161.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1161. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1161.h b/iconvdata/ibm1161.h index 14cc572c2d..dcba47eb0a 100644 --- a/iconvdata/ibm1161.h +++ b/iconvdata/ibm1161.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1161. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1162.c b/iconvdata/ibm1162.c index 40cdd93537..0178d00d53 100644 --- a/iconvdata/ibm1162.c +++ b/iconvdata/ibm1162.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1162. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1162.h b/iconvdata/ibm1162.h index f588413355..d920a5b7a8 100644 --- a/iconvdata/ibm1162.h +++ b/iconvdata/ibm1162.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1162. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1163.c b/iconvdata/ibm1163.c index ac55f3dbf7..98476363c1 100644 --- a/iconvdata/ibm1163.c +++ b/iconvdata/ibm1163.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1163. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1163.h b/iconvdata/ibm1163.h index cbc2e75175..bc79876cf0 100644 --- a/iconvdata/ibm1163.h +++ b/iconvdata/ibm1163.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1163. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1164.c b/iconvdata/ibm1164.c index ca529aa626..d0fd85ae48 100644 --- a/iconvdata/ibm1164.c +++ b/iconvdata/ibm1164.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1164. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1164.h b/iconvdata/ibm1164.h index a66ee05d71..759ff561a9 100644 --- a/iconvdata/ibm1164.h +++ b/iconvdata/ibm1164.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1164. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1166.c b/iconvdata/ibm1166.c index 9978dc67ad..e32bff4669 100644 --- a/iconvdata/ibm1166.c +++ b/iconvdata/ibm1166.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1166. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1166.h b/iconvdata/ibm1166.h index bbab81ea25..d3e3073d3e 100644 --- a/iconvdata/ibm1166.h +++ b/iconvdata/ibm1166.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1166. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1167.c b/iconvdata/ibm1167.c index 725a17700e..36eb1c07b7 100644 --- a/iconvdata/ibm1167.c +++ b/iconvdata/ibm1167.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1167. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1167.h b/iconvdata/ibm1167.h index 445a69339c..ca61f5692a 100644 --- a/iconvdata/ibm1167.h +++ b/iconvdata/ibm1167.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1167. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm12712.c b/iconvdata/ibm12712.c index 22d63ad3aa..f93d5054e1 100644 --- a/iconvdata/ibm12712.c +++ b/iconvdata/ibm12712.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM12712. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm12712.h b/iconvdata/ibm12712.h index bc041b1b6c..e2738c2354 100644 --- a/iconvdata/ibm12712.h +++ b/iconvdata/ibm12712.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM12712. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c index 373d49a743..99be3ed38e 100644 --- a/iconvdata/ibm1364.c +++ b/iconvdata/ibm1364.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1364. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. @@ -55,6 +55,7 @@ #else # define MAX_NEEDED_TO 4 #endif +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ int save_curcs; \ int *curcsp = &data->__statep->__count; @@ -77,7 +78,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -120,7 +121,7 @@ enum else \ { \ /* This is a combined character. Make sure we have room. */ \ - if (__builtin_expect (outptr + 8 > outend, 0)) \ + if (__glibc_unlikely (outptr + 8 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -204,7 +205,7 @@ enum { \ assert (curcs == db); \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -220,7 +221,8 @@ enum ++rp2; \ \ uint32_t res; \ - if (__builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (rp2->start == 0xffff, 0) \ + || __builtin_expect (ch < rp2->start, 0) \ || (res = DB_TO_UCS4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ { \ @@ -274,7 +276,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -301,7 +303,7 @@ enum { \ uint32_t ch = get32 (inptr); \ \ - if (__builtin_expect (ch >= UCS_LIMIT, 0)) \ + if (__glibc_unlikely (ch >= UCS_LIMIT)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -353,7 +355,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -364,13 +366,13 @@ enum } \ else \ { \ - if (__builtin_expect (curcs == db, 0)) \ + if (__glibc_unlikely (curcs == db)) \ { \ /* We know there is room for at least one byte. */ \ *outptr++ = SI; \ curcs = sb; \ \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm1364.h b/iconvdata/ibm1364.h index 1e014c0f72..6867c8ace7 100644 --- a/iconvdata/ibm1364.h +++ b/iconvdata/ibm1364.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1364. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1371.c b/iconvdata/ibm1371.c index 553d60dd5c..ef89cea21d 100644 --- a/iconvdata/ibm1371.c +++ b/iconvdata/ibm1371.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1371. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1371.h b/iconvdata/ibm1371.h index 916d05f049..fc7d59e8f0 100644 --- a/iconvdata/ibm1371.h +++ b/iconvdata/ibm1371.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1371. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1388.c b/iconvdata/ibm1388.c index 466415bb9f..c904038a80 100644 --- a/iconvdata/ibm1388.c +++ b/iconvdata/ibm1388.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1388. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1388.h b/iconvdata/ibm1388.h index 28a54b2cca..6a0cd45904 100644 --- a/iconvdata/ibm1388.h +++ b/iconvdata/ibm1388.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1388. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1390.c b/iconvdata/ibm1390.c index 11275aae44..ef5d06915c 100644 --- a/iconvdata/ibm1390.c +++ b/iconvdata/ibm1390.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1390. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1390.h b/iconvdata/ibm1390.h index eb6e2fb575..6969fd0311 100644 --- a/iconvdata/ibm1390.h +++ b/iconvdata/ibm1390.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1390. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1399.c b/iconvdata/ibm1399.c index f0f9d95fa9..2da263f1f1 100644 --- a/iconvdata/ibm1399.c +++ b/iconvdata/ibm1399.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1399. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1399.h b/iconvdata/ibm1399.h index deb76de8a1..97c8a08e79 100644 --- a/iconvdata/ibm1399.h +++ b/iconvdata/ibm1399.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1399. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm16804.c b/iconvdata/ibm16804.c index b4d71b6477..5882478fb0 100644 --- a/iconvdata/ibm16804.c +++ b/iconvdata/ibm16804.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM16804. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm16804.h b/iconvdata/ibm16804.h index 7c86f1a5cc..58dced1713 100644 --- a/iconvdata/ibm16804.h +++ b/iconvdata/ibm16804.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM16804. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm256.c b/iconvdata/ibm256.c index fa41fe697a..e630ce14fe 100644 --- a/iconvdata/ibm256.c +++ b/iconvdata/ibm256.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM256. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm273.c b/iconvdata/ibm273.c index b80560da94..37c8d14107 100644 --- a/iconvdata/ibm273.c +++ b/iconvdata/ibm273.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM273. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm274.c b/iconvdata/ibm274.c index 499aa513d8..fe1a029451 100644 --- a/iconvdata/ibm274.c +++ b/iconvdata/ibm274.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM274. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm275.c b/iconvdata/ibm275.c index c622478468..b19d70e3e9 100644 --- a/iconvdata/ibm275.c +++ b/iconvdata/ibm275.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM275. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm277.c b/iconvdata/ibm277.c index 0e4707568c..ca824a018e 100644 --- a/iconvdata/ibm277.c +++ b/iconvdata/ibm277.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM277. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm278.c b/iconvdata/ibm278.c index 8bb2a42c81..71bcb90bf5 100644 --- a/iconvdata/ibm278.c +++ b/iconvdata/ibm278.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM278. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm280.c b/iconvdata/ibm280.c index f254df84f8..ab7c5b3e45 100644 --- a/iconvdata/ibm280.c +++ b/iconvdata/ibm280.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM280. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm281.c b/iconvdata/ibm281.c index dba2db4869..254b365cb4 100644 --- a/iconvdata/ibm281.c +++ b/iconvdata/ibm281.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM281. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm284.c b/iconvdata/ibm284.c index 77bed8238b..dcdf261aa9 100644 --- a/iconvdata/ibm284.c +++ b/iconvdata/ibm284.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM284. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm285.c b/iconvdata/ibm285.c index 88d73a4674..899782da2e 100644 --- a/iconvdata/ibm285.c +++ b/iconvdata/ibm285.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM285. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm290.c b/iconvdata/ibm290.c index 2308cc9b5c..9fbf67c29b 100644 --- a/iconvdata/ibm290.c +++ b/iconvdata/ibm290.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM290. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm297.c b/iconvdata/ibm297.c index 92c403ac41..d86bd43fda 100644 --- a/iconvdata/ibm297.c +++ b/iconvdata/ibm297.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM297. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm420.c b/iconvdata/ibm420.c index 9f18b704c0..3e5c60f94a 100644 --- a/iconvdata/ibm420.c +++ b/iconvdata/ibm420.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM420. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm423.c b/iconvdata/ibm423.c index f6c391270c..18a96af723 100644 --- a/iconvdata/ibm423.c +++ b/iconvdata/ibm423.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM423. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm424.c b/iconvdata/ibm424.c index 3d741e1d20..1c45df6732 100644 --- a/iconvdata/ibm424.c +++ b/iconvdata/ibm424.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM424. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm437.c b/iconvdata/ibm437.c index 9f3cd91326..6fa0cbc393 100644 --- a/iconvdata/ibm437.c +++ b/iconvdata/ibm437.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM437. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm4517.c b/iconvdata/ibm4517.c index 673ec7197f..518bce3148 100644 --- a/iconvdata/ibm4517.c +++ b/iconvdata/ibm4517.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4517. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4517.h b/iconvdata/ibm4517.h index b95a50163e..774b94fb7c 100644 --- a/iconvdata/ibm4517.h +++ b/iconvdata/ibm4517.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4517. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4899.c b/iconvdata/ibm4899.c index c44a31d3b5..e0d5b76bee 100644 --- a/iconvdata/ibm4899.c +++ b/iconvdata/ibm4899.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4899. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4899.h b/iconvdata/ibm4899.h index 83ec298ebf..389828acf2 100644 --- a/iconvdata/ibm4899.h +++ b/iconvdata/ibm4899.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4899. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4909.c b/iconvdata/ibm4909.c index db09af5e33..9f9b986ae2 100644 --- a/iconvdata/ibm4909.c +++ b/iconvdata/ibm4909.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4909. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4909.h b/iconvdata/ibm4909.h index 83107aefa9..299347d72b 100644 --- a/iconvdata/ibm4909.h +++ b/iconvdata/ibm4909.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4909. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4971.c b/iconvdata/ibm4971.c index 3df14a6b35..b57e5fcaa0 100644 --- a/iconvdata/ibm4971.c +++ b/iconvdata/ibm4971.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4971. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4971.h b/iconvdata/ibm4971.h index dd8da0f542..9e9ab2cbc4 100644 --- a/iconvdata/ibm4971.h +++ b/iconvdata/ibm4971.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4971. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm500.c b/iconvdata/ibm500.c index a197df25df..05adb79f04 100644 --- a/iconvdata/ibm500.c +++ b/iconvdata/ibm500.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM500. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm5347.c b/iconvdata/ibm5347.c index d2f3d213e7..616fa34b65 100644 --- a/iconvdata/ibm5347.c +++ b/iconvdata/ibm5347.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM5347. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm5347.h b/iconvdata/ibm5347.h index 61ac6387ad..ddcb8456fd 100644 --- a/iconvdata/ibm5347.h +++ b/iconvdata/ibm5347.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM5347. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm803.c b/iconvdata/ibm803.c index af4b45f7e0..402201834e 100644 --- a/iconvdata/ibm803.c +++ b/iconvdata/ibm803.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM803. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm803.h b/iconvdata/ibm803.h index 3b31fc8889..602492ab42 100644 --- a/iconvdata/ibm803.h +++ b/iconvdata/ibm803.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM803. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm850.c b/iconvdata/ibm850.c index e3a3aa909c..0cba167fdd 100644 --- a/iconvdata/ibm850.c +++ b/iconvdata/ibm850.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM850. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm851.c b/iconvdata/ibm851.c index 0ad84ddbc8..48c7fe3f8f 100644 --- a/iconvdata/ibm851.c +++ b/iconvdata/ibm851.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM851. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm852.c b/iconvdata/ibm852.c index 2d90433e4c..a29a0d034c 100644 --- a/iconvdata/ibm852.c +++ b/iconvdata/ibm852.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM852. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm855.c b/iconvdata/ibm855.c index 4b96079c8a..6e90ad4a11 100644 --- a/iconvdata/ibm855.c +++ b/iconvdata/ibm855.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM855. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm856.c b/iconvdata/ibm856.c index 7de1211dfd..cbc32509c5 100644 --- a/iconvdata/ibm856.c +++ b/iconvdata/ibm856.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM856. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm856.h b/iconvdata/ibm856.h index cd221de0fb..69936d0e5e 100644 --- a/iconvdata/ibm856.h +++ b/iconvdata/ibm856.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM856. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm857.c b/iconvdata/ibm857.c index 7a74e5cb4f..6fd504d91c 100644 --- a/iconvdata/ibm857.c +++ b/iconvdata/ibm857.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM857. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm860.c b/iconvdata/ibm860.c index a95e9ff736..27a0c64613 100644 --- a/iconvdata/ibm860.c +++ b/iconvdata/ibm860.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM860. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm861.c b/iconvdata/ibm861.c index fa1c0ac8e4..04df881c3f 100644 --- a/iconvdata/ibm861.c +++ b/iconvdata/ibm861.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM861. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm862.c b/iconvdata/ibm862.c index 61b08ebd4f..eda38a6014 100644 --- a/iconvdata/ibm862.c +++ b/iconvdata/ibm862.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM862. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm863.c b/iconvdata/ibm863.c index 544b7295b3..9d4c0611e8 100644 --- a/iconvdata/ibm863.c +++ b/iconvdata/ibm863.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM863. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm864.c b/iconvdata/ibm864.c index beb2520f96..c2925c0c74 100644 --- a/iconvdata/ibm864.c +++ b/iconvdata/ibm864.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM864. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm865.c b/iconvdata/ibm865.c index 5bacf9597f..8c7337c0ca 100644 --- a/iconvdata/ibm865.c +++ b/iconvdata/ibm865.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM865. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm866.c b/iconvdata/ibm866.c index d6385d6402..7546f49c4a 100644 --- a/iconvdata/ibm866.c +++ b/iconvdata/ibm866.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM866. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm866nav.c b/iconvdata/ibm866nav.c index b0f8dfdb54..baf7300b47 100644 --- a/iconvdata/ibm866nav.c +++ b/iconvdata/ibm866nav.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM866NAV. - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2003. diff --git a/iconvdata/ibm868.c b/iconvdata/ibm868.c index ad1f69c7a4..7514cac5fd 100644 --- a/iconvdata/ibm868.c +++ b/iconvdata/ibm868.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM868. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm869.c b/iconvdata/ibm869.c index 0b364c3d3e..86fec7be73 100644 --- a/iconvdata/ibm869.c +++ b/iconvdata/ibm869.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM869. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm870.c b/iconvdata/ibm870.c index d56fd4f21d..c033d7aa6c 100644 --- a/iconvdata/ibm870.c +++ b/iconvdata/ibm870.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM870. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm871.c b/iconvdata/ibm871.c index 2f5d4685eb..6b63454d25 100644 --- a/iconvdata/ibm871.c +++ b/iconvdata/ibm871.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM871. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm874.c b/iconvdata/ibm874.c index 7568cbdf4e..61235af24a 100644 --- a/iconvdata/ibm874.c +++ b/iconvdata/ibm874.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM874. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm875.c b/iconvdata/ibm875.c index 016d319533..4842cfef00 100644 --- a/iconvdata/ibm875.c +++ b/iconvdata/ibm875.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM875. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm880.c b/iconvdata/ibm880.c index 090566cc2a..838fd56b10 100644 --- a/iconvdata/ibm880.c +++ b/iconvdata/ibm880.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM880. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm891.c b/iconvdata/ibm891.c index 574a570e08..47ae89b25d 100644 --- a/iconvdata/ibm891.c +++ b/iconvdata/ibm891.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM891. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm901.c b/iconvdata/ibm901.c index 91f8a85b5c..35245e38cb 100644 --- a/iconvdata/ibm901.c +++ b/iconvdata/ibm901.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM901. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm901.h b/iconvdata/ibm901.h index 2662680e37..4eca9298c9 100644 --- a/iconvdata/ibm901.h +++ b/iconvdata/ibm901.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM901. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm902.c b/iconvdata/ibm902.c index 0ac01b1c62..30383227a0 100644 --- a/iconvdata/ibm902.c +++ b/iconvdata/ibm902.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM902. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm902.h b/iconvdata/ibm902.h index 9e7f19d791..716cdad918 100644 --- a/iconvdata/ibm902.h +++ b/iconvdata/ibm902.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM902. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm903.c b/iconvdata/ibm903.c index bc3f34de31..9372f91f48 100644 --- a/iconvdata/ibm903.c +++ b/iconvdata/ibm903.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM903. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm9030.c b/iconvdata/ibm9030.c index 793d1641e0..d7ba55c114 100644 --- a/iconvdata/ibm9030.c +++ b/iconvdata/ibm9030.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9030. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9030.h b/iconvdata/ibm9030.h index d6e050e020..12fea1f5bc 100644 --- a/iconvdata/ibm9030.h +++ b/iconvdata/ibm9030.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9030. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm904.c b/iconvdata/ibm904.c index 2ef227a89b..b0e08579b6 100644 --- a/iconvdata/ibm904.c +++ b/iconvdata/ibm904.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM904. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm905.c b/iconvdata/ibm905.c index 178b5c44b1..82bfd24c35 100644 --- a/iconvdata/ibm905.c +++ b/iconvdata/ibm905.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM905. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm9066.c b/iconvdata/ibm9066.c index 9048e659f2..23fc1e0f11 100644 --- a/iconvdata/ibm9066.c +++ b/iconvdata/ibm9066.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9066. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9066.h b/iconvdata/ibm9066.h index ba7cdc6e28..c3443e3fe7 100644 --- a/iconvdata/ibm9066.h +++ b/iconvdata/ibm9066.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9066. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm918.c b/iconvdata/ibm918.c index 3ee0af637b..c1eae2811c 100644 --- a/iconvdata/ibm918.c +++ b/iconvdata/ibm918.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM918. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm921.c b/iconvdata/ibm921.c index 46a8429a67..40a4da4715 100644 --- a/iconvdata/ibm921.c +++ b/iconvdata/ibm921.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM921. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm921.h b/iconvdata/ibm921.h index 67f629d477..81c625e462 100644 --- a/iconvdata/ibm921.h +++ b/iconvdata/ibm921.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM921. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm922.c b/iconvdata/ibm922.c index 24b01e0293..b4bfe05132 100644 --- a/iconvdata/ibm922.c +++ b/iconvdata/ibm922.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM922. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm922.h b/iconvdata/ibm922.h index 0afb15195f..62dd3bd2f8 100644 --- a/iconvdata/ibm922.h +++ b/iconvdata/ibm922.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM922. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c index 83276905a0..91327f1e18 100644 --- a/iconvdata/ibm930.c +++ b/iconvdata/ibm930.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM930. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -31,6 +31,7 @@ #define CHARSET_NAME "IBM930//" #define FROM_LOOP from_ibm930 #define TO_LOOP to_ibm930 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -61,7 +62,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -150,7 +151,7 @@ enum \ assert (curcs == db); \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -197,7 +198,7 @@ enum const struct gap *rp2 = __ucs4_to_ibm930db_idx; \ const char *cp; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -227,7 +228,7 @@ enum { \ if (curcs == sb) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -236,7 +237,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -249,7 +250,7 @@ enum { \ if (curcs == db) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -257,7 +258,7 @@ enum *outptr++ = SI; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm930.h b/iconvdata/ibm930.h index 55863d3ad0..f210d25def 100644 --- a/iconvdata/ibm930.h +++ b/iconvdata/ibm930.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM930. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm932.c b/iconvdata/ibm932.c index 4ceeaae5b9..8adfb04f47 100644 --- a/iconvdata/ibm932.c +++ b/iconvdata/ibm932.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM932. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. @@ -29,6 +29,7 @@ #define CHARSET_NAME "IBM932//" #define FROM_LOOP from_ibm932 #define TO_LOOP to_ibm932 +#define ONE_DIRECTION 0 /* Definitions of initialization and destructor function. */ #define DEFINE_INIT 1 @@ -64,7 +65,7 @@ if (__builtin_expect (res == 0, 0) && ch != 0) \ { \ /* Use the IBM932 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. \ Store the intermediate result. */ \ @@ -73,11 +74,12 @@ } \ \ ch = (ch * 0x100) + inptr[1]; \ + /* ch was less than 0xfd. */ \ + assert (ch < 0xfd00); \ while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ - || __builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (ch < rp2->start, 0) \ || (res = __ibm932db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, '\1') == 0 && ch !=0)) \ { \ @@ -134,7 +136,7 @@ uint32_t high; \ uint16_t pccode; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ rp = NULL; \ @@ -156,7 +158,7 @@ high = (sizeof (__ucs4_to_ibm932db) >> 1) \ / sizeof (__ucs4_to_ibm932db[0][FROM]); \ pccode = ch; \ - if (__builtin_expect (rp != NULL, 1)) \ + if (__glibc_likely (rp != NULL)) \ while (low < high) \ { \ i = (low + high) >> 1; \ @@ -173,7 +175,7 @@ } \ if (found) \ { \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -189,7 +191,7 @@ } \ else \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm932.h b/iconvdata/ibm932.h index b471ed7f78..f51075d47e 100644 --- a/iconvdata/ibm932.h +++ b/iconvdata/ibm932.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM932. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c index 4723df4890..d1f3f05296 100644 --- a/iconvdata/ibm933.c +++ b/iconvdata/ibm933.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM933. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -31,6 +31,7 @@ #define CHARSET_NAME "IBM933//" #define FROM_LOOP from_ibm933 #define TO_LOOP to_ibm933 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -61,7 +62,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -149,7 +150,7 @@ enum assert (curcs == db); \ \ /* Use the IBM933 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -161,7 +162,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ + if (__builtin_expect (rp2->start == 0xffff, 0) \ || __builtin_expect (ch < rp2->start, 0) \ || (res = __ibm933db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ @@ -196,7 +197,7 @@ enum const struct gap *rp2 = __ucs4_to_ibm933db_idx; \ const char *cp; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -226,7 +227,7 @@ enum { \ if (curcs == sb) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -235,7 +236,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -248,7 +249,7 @@ enum { \ if (curcs == db) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -256,7 +257,7 @@ enum *outptr++ = SI; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm933.h b/iconvdata/ibm933.h index 372e0d000b..3df1bbc1ca 100644 --- a/iconvdata/ibm933.h +++ b/iconvdata/ibm933.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM933. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm935.c b/iconvdata/ibm935.c index 1ed311b01f..afb3449623 100644 --- a/iconvdata/ibm935.c +++ b/iconvdata/ibm935.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM935 - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -31,6 +31,7 @@ #define CHARSET_NAME "IBM935//" #define FROM_LOOP from_ibm935 #define TO_LOOP to_ibm935 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -61,7 +62,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -149,7 +150,7 @@ enum assert (curcs == db); \ \ /* Use the IBM935 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. \ Store the intermediate result. */ \ @@ -161,7 +162,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ + if (__builtin_expect (rp2->start == 0xffff, 0) \ || __builtin_expect (ch < rp2->start, 0) \ || (res = __ibm935db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ @@ -196,7 +197,7 @@ enum const struct gap *rp2 = __ucs4_to_ibm935db_idx; \ const char *cp; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -226,7 +227,7 @@ enum { \ if (curcs == sb) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -235,7 +236,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -248,7 +249,7 @@ enum { \ if (curcs == db) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -256,7 +257,7 @@ enum *outptr++ = SI; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm935.h b/iconvdata/ibm935.h index 8158eb3406..4aa400d02f 100644 --- a/iconvdata/ibm935.h +++ b/iconvdata/ibm935.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM935 - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm937.c b/iconvdata/ibm937.c index 1edaf624d0..744f32fded 100644 --- a/iconvdata/ibm937.c +++ b/iconvdata/ibm937.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM937. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -31,6 +31,7 @@ #define CHARSET_NAME "IBM937//" #define FROM_LOOP from_ibm937 #define TO_LOOP to_ibm937 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -61,7 +62,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -149,7 +150,7 @@ enum assert (curcs == db); \ \ /* Use the IBM937 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. \ Store the intermediate result. */ \ @@ -161,7 +162,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ + if (__builtin_expect (rp2->start == 0xffff, 0) \ || __builtin_expect (ch < rp2->start, 0) \ || (res = __ibm937db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ @@ -196,7 +197,7 @@ enum const struct gap *rp2 = __ucs4_to_ibm937db_idx; \ const char *cp; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -226,7 +227,7 @@ enum { \ if (curcs == sb) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -235,7 +236,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -248,7 +249,7 @@ enum { \ if (curcs == db) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -256,7 +257,7 @@ enum *outptr++ = SI; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm937.h b/iconvdata/ibm937.h index b2428ed899..e82874fecb 100644 --- a/iconvdata/ibm937.h +++ b/iconvdata/ibm937.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM937. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c index b40c486540..3b189ddbfd 100644 --- a/iconvdata/ibm939.c +++ b/iconvdata/ibm939.c @@ -1,5 +1,5 @@ /* Conversion to and from IBM939. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -31,6 +31,7 @@ #define CHARSET_NAME "IBM939//" #define FROM_LOOP from_ibm939 #define TO_LOOP to_ibm939 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -61,7 +62,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -149,7 +150,7 @@ enum \ assert (curcs == db); \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -161,7 +162,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ + if (__builtin_expect (rp2->start == 0xffff, 0) \ || __builtin_expect (ch < rp2->start, 0) \ || (res = __ibm939db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ @@ -196,7 +197,7 @@ enum const struct gap *rp2 = __ucs4_to_ibm939db_idx; \ const char *cp; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ goto ibm939_invalid_char; \ @@ -226,7 +227,7 @@ enum { \ if (curcs == sb) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -235,7 +236,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -248,7 +249,7 @@ enum { \ if (curcs == db) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -256,7 +257,7 @@ enum *outptr++ = SI; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm939.h b/iconvdata/ibm939.h index c5bdb4cab6..15b8504ae8 100644 --- a/iconvdata/ibm939.h +++ b/iconvdata/ibm939.h @@ -1,5 +1,5 @@ /* Tables for conversion to and from IBM939. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c index 495e37909e..3bf1eb0577 100644 --- a/iconvdata/ibm943.c +++ b/iconvdata/ibm943.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM943. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. @@ -29,6 +29,7 @@ #define CHARSET_NAME "IBM943//" #define FROM_LOOP from_ibm943 #define TO_LOOP to_ibm943 +#define ONE_DIRECTION 0 /* Definitions of initialization and destructor function. */ #define DEFINE_INIT 1 @@ -65,7 +66,7 @@ __builtin_expect (res == 0, 0) && ch != 0)) \ { \ /* Use the IBM943 table for double byte. */ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. \ Store the intermediate result. */ \ @@ -74,11 +75,12 @@ } \ \ ch = (ch * 0x100) + inptr[1]; \ + /* ch was less than 0xfd. */ \ + assert (ch < 0xfd00); \ while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ - || __builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (ch < rp2->start, 0) \ || (res = __ibm943db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, '\1') == 0 && ch !=0)) \ { \ @@ -135,7 +137,7 @@ uint32_t high; \ uint16_t pccode; \ \ - if (__builtin_expect (ch >= 0xffff, 0)) \ + if (__glibc_unlikely (ch >= 0xffff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ rp = NULL; \ @@ -157,7 +159,7 @@ high = (sizeof (__ucs4_to_ibm943db) >> 1) \ / sizeof (__ucs4_to_ibm943db[0][FROM]); \ pccode = ch; \ - if (__builtin_expect (rp != NULL, 1)) \ + if (__glibc_likely (rp != NULL)) \ while (low < high) \ { \ i = (low + high) >> 1; \ @@ -174,7 +176,7 @@ } \ if (found) \ { \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -190,7 +192,7 @@ } \ else \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/ibm943.h b/iconvdata/ibm943.h index 11acf51780..65996eb2c5 100644 --- a/iconvdata/ibm943.h +++ b/iconvdata/ibm943.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM943. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm9448.c b/iconvdata/ibm9448.c index 325c8c542b..96da0a17c1 100644 --- a/iconvdata/ibm9448.c +++ b/iconvdata/ibm9448.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9448. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9448.h b/iconvdata/ibm9448.h index 4323419736..6349d814e9 100644 --- a/iconvdata/ibm9448.h +++ b/iconvdata/ibm9448.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9448. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/iec_p27-1.c b/iconvdata/iec_p27-1.c index dd23411d54..c7f0326195 100644 --- a/iconvdata/iec_p27-1.c +++ b/iconvdata/iec_p27-1.c @@ -1,5 +1,5 @@ /* Conversion from and to IEC_P27-1. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis-8.c b/iconvdata/inis-8.c index ae59c0f71d..c46eda129d 100644 --- a/iconvdata/inis-8.c +++ b/iconvdata/inis-8.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS-8. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis-cyrillic.c b/iconvdata/inis-cyrillic.c index c3865a9ba0..8fa56a9e13 100644 --- a/iconvdata/inis-cyrillic.c +++ b/iconvdata/inis-cyrillic.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS-CYRILLIC. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis.c b/iconvdata/inis.c index 70954cf55c..4cacfe06c2 100644 --- a/iconvdata/inis.c +++ b/iconvdata/inis.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/isiri-3342.c b/iconvdata/isiri-3342.c index f214cca8dc..9f8235021b 100644 --- a/iconvdata/isiri-3342.c +++ b/iconvdata/isiri-3342.c @@ -1,5 +1,5 @@ /* Conversion from and to ISIRI-3342. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index 64196ac792..2c9846d3be 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-CN-EXT. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -47,6 +47,7 @@ #define CHARSET_NAME "ISO-2022-CN-EXT//" #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP from_iso2022cn_ext_loop #define TO_LOOP to_iso2022cn_ext_loop #define FROM_LOOP_MIN_NEEDED_FROM 1 @@ -137,7 +138,7 @@ enum { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf == outend, 0)) \ + if (__glibc_unlikely (outbuf == outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 0e5a6aabe7..ed928589c6 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-CN. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -44,6 +44,7 @@ #define DEFINE_FINI 1 #define FROM_LOOP from_iso2022cn_loop #define TO_LOOP to_iso2022cn_loop +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 4 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -88,7 +89,7 @@ enum { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf == outend, 0)) \ + if (__glibc_unlikely (outbuf == outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -121,7 +122,7 @@ enum uint32_t ch = *inptr; \ \ /* This is a 7bit character set, disallow all 8bit characters. */ \ - if (__builtin_expect (ch >= 0x7f, 0)) \ + if (__glibc_unlikely (ch >= 0x7f)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ /* Recognize escape sequences. */ \ @@ -246,7 +247,7 @@ enum { \ *outptr++ = SI; \ set = ASCII_set; \ - if (__builtin_expect (outptr == outend, 0)) \ + if (__glibc_unlikely (outptr == outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -319,7 +320,7 @@ enum { \ const char *escseq; \ \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -342,7 +343,7 @@ enum \ if (used == CNS11643_2_set) \ { \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -357,7 +358,7 @@ enum SO charset. */ \ if (set == ASCII_set) \ { \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -368,13 +369,13 @@ enum \ /* Always test the length here since we have used up all the \ guaranteed output buffer slots. */ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ } \ } \ - else if (__builtin_expect (outptr + 2 > outend, 0)) \ + else if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c index e90d68a444..7b85e609d4 100644 --- a/iconvdata/iso-2022-jp-3.c +++ b/iconvdata/iso-2022-jp-3.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-JP-3. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <bruno@clisp.org>, 2002. @@ -37,6 +37,7 @@ #define TO_LOOP to_iso2022jp3_loop #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 4 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -96,7 +97,7 @@ enum + ((data->__statep->__count & CURRENT_SEL_MASK) != ASCII_set \ ? 3 : 0); \ \ - if (__builtin_expect (outbuf + need > outend, 0)) \ + if (__glibc_unlikely (outbuf + need > outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -153,7 +154,7 @@ enum uint32_t ch = *inptr; \ \ /* Recognize escape sequences. */ \ - if (__builtin_expect (ch == ESC, 0)) \ + if (__glibc_unlikely (ch == ESC)) \ { \ /* We now must be prepared to read two to three more bytes. \ If we have a match in the first byte but then the input buffer \ @@ -242,7 +243,7 @@ enum { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch); \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ @@ -252,7 +253,7 @@ enum { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch + 0x80); \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ @@ -266,19 +267,19 @@ enum provide the appropriate tables. */ \ ch = jisx0208_to_ucs4 (&inptr, inend - inptr, 0); \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - else if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + else if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ } \ else /* (set == JISX0213_1_2004_set || set == JISX0213_2_set) */ \ { \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ @@ -416,7 +417,7 @@ static const struct || (set != JISX0213_1_2000_set && set != JISX0213_1_2004_set) \ ? 4 : 0); \ \ - if (__builtin_expect (outptr + need + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + need + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -444,7 +445,7 @@ static const struct { \ size_t need = (lasttwo >> 16 ? 3 : 0); \ \ - if (__builtin_expect (outptr + need + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + need + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -520,7 +521,7 @@ static const struct inptr += 4; \ continue; \ } \ - if (__builtin_expect (written == 0, 0)) \ + if (__glibc_unlikely (written == 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -558,7 +559,7 @@ static const struct continue; \ } \ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -578,7 +579,7 @@ static const struct { \ /* We must encode using ASCII. First write out the escape \ sequence. */ \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -589,7 +590,7 @@ static const struct *outptr++ = 'B'; \ set = ASCII_set; \ \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -606,7 +607,7 @@ static const struct { \ if (set != JISX0201_Roman_set) \ { \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -617,7 +618,7 @@ static const struct set = JISX0201_Roman_set; \ } \ \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -644,7 +645,7 @@ static const struct \ if (set != JISX0208_1983_set) \ { \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -655,7 +656,7 @@ static const struct set = JISX0208_1983_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -677,7 +678,7 @@ static const struct \ if (set != new_set) \ { \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -703,7 +704,7 @@ static const struct continue; \ } \ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -732,7 +733,7 @@ static const struct set = JISX0201_Kana_set; \ } \ \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index e9d5db4b68..d4cbabc5df 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-JP and ISO-2022-JP-2. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -48,6 +48,7 @@ struct gap /* Definitions used in the body of the `gconv' function. */ #define FROM_LOOP from_iso2022jp_loop #define TO_LOOP to_iso2022jp_loop +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 4 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -231,7 +232,7 @@ gconv_end (struct __gconv_step *data) { \ /* We are not in the initial state. To switch back we have \ to emit the sequence `Esc ( B'. */ \ - if (__builtin_expect (outbuf + 3 > outend, 0)) \ + if (__glibc_unlikely (outbuf + 3 > outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -404,7 +405,7 @@ gconv_end (struct __gconv_step *data) { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch); \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ ++inptr; \ } \ @@ -412,7 +413,7 @@ gconv_end (struct __gconv_step *data) { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch + 0x80); \ - if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ ++inptr; \ } \ @@ -438,12 +439,12 @@ gconv_end (struct __gconv_step *data) ch = ksc5601_to_ucs4 (&inptr, inend - inptr, 0); \ } \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - else if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + else if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ @@ -493,7 +494,7 @@ static const cvlist_t conversion_lists[4] = if (var == iso2022jp2) \ { \ /* Handle Unicode tag characters (range U+E0000..U+E007F). */ \ - if (__builtin_expect ((ch >> 7) == (0xe0000 >> 7), 0)) \ + if (__glibc_unlikely ((ch >> 7) == (0xe0000 >> 7))) \ { \ ch &= 0x7f; \ if (ch >= 'A' && ch <= 'Z') \ @@ -529,7 +530,7 @@ static const cvlist_t conversion_lists[4] = \ /* Non-tag characters reset the tag parsing state, if the current \ state is a temporary state. */ \ - if (__builtin_expect (tag >= TAG_language, 0)) \ + if (__glibc_unlikely (tag >= TAG_language)) \ tag = TAG_none; \ } \ \ @@ -613,7 +614,7 @@ static const cvlist_t conversion_lists[4] = else \ written = __UNKNOWN_10646_CHAR; \ \ - if (__builtin_expect (written == 0, 0)) \ + if (__glibc_unlikely (written == 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -629,7 +630,7 @@ static const cvlist_t conversion_lists[4] = { \ if (ch >= 0x80 && ch <= 0xff) \ { \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -643,7 +644,7 @@ static const cvlist_t conversion_lists[4] = } \ else if (set2 == ISO88597_set) \ { \ - if (__builtin_expect (ch < 0xffff, 1)) \ + if (__glibc_likely (ch < 0xffff)) \ { \ const struct gap *rp = from_idx; \ \ @@ -655,7 +656,7 @@ static const cvlist_t conversion_lists[4] = iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \ if (res != '\0') \ { \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -685,7 +686,7 @@ static const cvlist_t conversion_lists[4] = { \ /* We must encode using ASCII. First write out the \ escape sequence. */ \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -696,7 +697,7 @@ static const cvlist_t conversion_lists[4] = *outptr++ = 'B'; \ set = ASCII_set; \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -742,7 +743,7 @@ static const cvlist_t conversion_lists[4] = set2 = ISO88591_set; \ } \ \ - if (__builtin_expect (outptr + 3 > outend, 0)) \ + if (__glibc_unlikely (outptr + 3 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -755,7 +756,7 @@ static const cvlist_t conversion_lists[4] = } \ \ /* Try ISO 8859-7 upper half. */ \ - if (__builtin_expect (ch < 0xffff, 1)) \ + if (__glibc_likely (ch < 0xffff)) \ { \ const struct gap *rp = from_idx; \ \ @@ -817,7 +818,7 @@ static const cvlist_t conversion_lists[4] = set = JISX0201_Roman_set; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -844,7 +845,7 @@ static const cvlist_t conversion_lists[4] = set = JISX0208_1983_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -855,7 +856,7 @@ static const cvlist_t conversion_lists[4] = break; \ } \ \ - if (__builtin_expect (var == iso2022jp, 0)) \ + if (__glibc_unlikely (var == iso2022jp)) \ /* Don't use the other Japanese character sets. */ \ break; \ \ @@ -877,7 +878,7 @@ static const cvlist_t conversion_lists[4] = set = JISX0212_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -910,7 +911,7 @@ static const cvlist_t conversion_lists[4] = set = GB2312_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -944,7 +945,7 @@ static const cvlist_t conversion_lists[4] = set = KSC5601_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ @@ -979,7 +980,7 @@ static const cvlist_t conversion_lists[4] = set = JISX0201_Kana_set; \ } \ \ - if (__builtin_expect (outptr + 1 > outend, 0)) \ + if (__glibc_unlikely (outptr + 1 > outend)) \ { \ res = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c index 2377ae5f2a..5d2790d388 100644 --- a/iconvdata/iso-2022-kr.c +++ b/iconvdata/iso-2022-kr.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-KR. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -42,6 +42,7 @@ #define MAX_NEEDED_FROM 4 #define MIN_NEEDED_TO 4 #define MAX_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ int save_set; \ int *setp = &data->__statep->__count; \ @@ -86,7 +87,7 @@ enum { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf == outend, 0)) \ + if (__glibc_unlikely (outbuf == outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -118,7 +119,7 @@ enum uint32_t ch = *inptr; \ \ /* This is a 7bit character set, disallow all 8bit characters. */ \ - if (__builtin_expect (ch > 0x7f, 0)) \ + if (__glibc_unlikely (ch > 0x7f)) \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ \ /* Recognize escape sequences. */ \ @@ -171,12 +172,12 @@ enum /* Use the KSC 5601 table. */ \ ch = ksc5601_to_ucs4 (&inptr, inend - inptr, 0); \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - else if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \ + else if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ @@ -209,7 +210,7 @@ enum { \ *outptr++ = SI; \ set = ASCII_set; \ - if (__builtin_expect (outptr == outend, 0)) \ + if (__glibc_unlikely (outptr == outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -243,7 +244,7 @@ enum set = KSC5601_set; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/iso-ir-165.c b/iconvdata/iso-ir-165.c index 72eea5ff2b..875b96c19a 100644 --- a/iconvdata/iso-ir-165.c +++ b/iconvdata/iso-ir-165.c @@ -1,6 +1,6 @@ /* Tables for conversion to and from ISO-IR-165. converting from UCS using gaps. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso-ir-165.h b/iconvdata/iso-ir-165.h index 3b5649c710..ff84e2f83f 100644 --- a/iconvdata/iso-ir-165.h +++ b/iconvdata/iso-ir-165.h @@ -1,6 +1,6 @@ /* Tables for conversion to and from ISO-IR-165. converting from UCS using gaps. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso-ir-197.c b/iconvdata/iso-ir-197.c index b472823e38..08e6fa0938 100644 --- a/iconvdata/iso-ir-197.c +++ b/iconvdata/iso-ir-197.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO-IR-197. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/iso-ir-209.c b/iconvdata/iso-ir-209.c index 9c50951430..22e2731d4c 100644 --- a/iconvdata/iso-ir-209.c +++ b/iconvdata/iso-ir-209.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO-IR-209. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index 35fe93d880..e341267060 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -1,5 +1,5 @@ /* Conversion to and from the various ISO 646 CCS. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -43,6 +43,8 @@ #define DEFINE_FINI 0 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 + #define FROM_DIRECTION (dir == from_iso646) #define PREPARE_LOOP \ enum direction dir = ((struct iso646_data *) step->__data)->dir; \ @@ -870,7 +872,7 @@ gconv_end (struct __gconv_step *data) ch = 0x5d; \ break; \ default: \ - if (__builtin_expect (ch > 0x7f, 0)) \ + if (__glibc_unlikely (ch > 0x7f)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ failure = __GCONV_ILLEGAL_INPUT; \ diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c index 6aa6e3550c..038d6d9cc4 100644 --- a/iconvdata/iso8859-1.c +++ b/iconvdata/iso8859-1.c @@ -1,5 +1,5 @@ /* Conversion to and from ISO 8859-1. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -28,6 +28,7 @@ #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from ISO 8859-1 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -50,7 +51,7 @@ #define BODY \ { \ uint32_t ch = *((const uint32_t *) inptr); \ - if (__builtin_expect (ch > 0xff, 0)) \ + if (__glibc_unlikely (ch > 0xff)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ diff --git a/iconvdata/iso8859-10.c b/iconvdata/iso8859-10.c index 9c5aaafe8f..f33d994e79 100644 --- a/iconvdata/iso8859-10.c +++ b/iconvdata/iso8859-10.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-10. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-11.c b/iconvdata/iso8859-11.c index d9bc57df9d..29d2684e57 100644 --- a/iconvdata/iso8859-11.c +++ b/iconvdata/iso8859-11.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-11. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-13.c b/iconvdata/iso8859-13.c index 09526a43d8..224eb80f04 100644 --- a/iconvdata/iso8859-13.c +++ b/iconvdata/iso8859-13.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-13. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-14.c b/iconvdata/iso8859-14.c index c6ae1701e2..a20a993503 100644 --- a/iconvdata/iso8859-14.c +++ b/iconvdata/iso8859-14.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-14. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-15.c b/iconvdata/iso8859-15.c index 826c05d75a..b63815e052 100644 --- a/iconvdata/iso8859-15.c +++ b/iconvdata/iso8859-15.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-15. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-16.c b/iconvdata/iso8859-16.c index 91f5d473a8..7d4cc9c99f 100644 --- a/iconvdata/iso8859-16.c +++ b/iconvdata/iso8859-16.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-16. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso8859-2.c b/iconvdata/iso8859-2.c index 2a962366f0..e8c0ab437a 100644 --- a/iconvdata/iso8859-2.c +++ b/iconvdata/iso8859-2.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-2. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-3.c b/iconvdata/iso8859-3.c index 8f89e6ccf9..a7a3c72536 100644 --- a/iconvdata/iso8859-3.c +++ b/iconvdata/iso8859-3.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-3. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-4.c b/iconvdata/iso8859-4.c index 413d6dc1af..3e2103b4f0 100644 --- a/iconvdata/iso8859-4.c +++ b/iconvdata/iso8859-4.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-4. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-5.c b/iconvdata/iso8859-5.c index 5ae9bf0fde..25436a489f 100644 --- a/iconvdata/iso8859-5.c +++ b/iconvdata/iso8859-5.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-5. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-6.c b/iconvdata/iso8859-6.c index 5a96214b52..b9fc7db905 100644 --- a/iconvdata/iso8859-6.c +++ b/iconvdata/iso8859-6.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-6. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-7.c b/iconvdata/iso8859-7.c index bdf7df118d..697b4d7e2d 100644 --- a/iconvdata/iso8859-7.c +++ b/iconvdata/iso8859-7.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-7. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-8.c b/iconvdata/iso8859-8.c index a0b6d4e2e0..1c6690102a 100644 --- a/iconvdata/iso8859-8.c +++ b/iconvdata/iso8859-8.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-8. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-9.c b/iconvdata/iso8859-9.c index 7097803902..0da0092e47 100644 --- a/iconvdata/iso8859-9.c +++ b/iconvdata/iso8859-9.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-9. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-9e.c b/iconvdata/iso8859-9e.c index c5834e113a..5464924ed5 100644 --- a/iconvdata/iso8859-9e.c +++ b/iconvdata/iso8859-9e.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-9E. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/iso_10367-box.c b/iconvdata/iso_10367-box.c index 06fb4a4804..6c2cf12038 100644 --- a/iconvdata/iso_10367-box.c +++ b/iconvdata/iso_10367-box.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_10367-BOX. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_11548-1.c b/iconvdata/iso_11548-1.c index 51aed763e8..93882d4e7a 100644 --- a/iconvdata/iso_11548-1.c +++ b/iconvdata/iso_11548-1.c @@ -1,5 +1,5 @@ /* Conversion to and from ISO 11548-1. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997, Samuel Thibault <samuel.thibault@ens-lyon.org>, 2005. @@ -29,6 +29,7 @@ #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define BRAILLE_UCS_BASE 0x2800 @@ -53,7 +54,7 @@ #define BODY \ { \ uint32_t ch = *((const uint32_t *) inptr); \ - if (__builtin_expect ((ch & 0xffffff00u) != BRAILLE_UCS_BASE, 0)) \ + if (__glibc_unlikely ((ch & 0xffffff00u) != BRAILLE_UCS_BASE)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ diff --git a/iconvdata/iso_2033.c b/iconvdata/iso_2033.c index e64f527750..e56c910bd4 100644 --- a/iconvdata/iso_2033.c +++ b/iconvdata/iso_2033.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_2033-1983. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5427-ext.c b/iconvdata/iso_5427-ext.c index 45e480c991..7edab240aa 100644 --- a/iconvdata/iso_5427-ext.c +++ b/iconvdata/iso_5427-ext.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5427-EXT. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5427.c b/iconvdata/iso_5427.c index 737d81c156..db794208a5 100644 --- a/iconvdata/iso_5427.c +++ b/iconvdata/iso_5427.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5427. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5428.c b/iconvdata/iso_5428.c index 1c5aaf4748..476be8501c 100644 --- a/iconvdata/iso_5428.c +++ b/iconvdata/iso_5428.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5428. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c index d5e09a3795..8ea1a4eb01 100644 --- a/iconvdata/iso_6937-2.c +++ b/iconvdata/iso_6937-2.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ISO 6937-2. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -380,6 +380,7 @@ static const char from_ucs4[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from ISO 6937-2 to UCS4. */ @@ -397,7 +398,7 @@ static const char from_ucs4[][2] = is also available. */ \ int ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -416,7 +417,7 @@ static const char from_ucs4[][2] = \ ch = to_ucs4_comb[ch - 0xc1][ch2 - 0x20]; \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* Illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ @@ -536,7 +537,7 @@ static const char from_ucs4[][2] = /* Now test for a possible second byte and write this if possible. */ \ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ /* The result does not fit into the buffer. */ \ --outptr; \ diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index 66d86b1dce..5f95b45cfa 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ISO 6937. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -380,6 +380,7 @@ static const char from_ucs4[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from ISO 6937 to UCS4. */ @@ -397,7 +398,7 @@ static const char from_ucs4[][2] = is also available. */ \ int ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -416,7 +417,7 @@ static const char from_ucs4[][2] = \ ch = to_ucs4_comb[ch - 0xc1][ch2 - 0x20]; \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* Illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ @@ -520,7 +521,7 @@ static const char from_ucs4[][2] = fail = 1; \ } \ \ - if (__builtin_expect (fail, 0)) \ + if (__glibc_unlikely (fail)) \ { \ /* Illegal characters. */ \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ @@ -538,7 +539,7 @@ static const char from_ucs4[][2] = /* Now test for a possible second byte and write this if possible. */ \ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ /* The result does not fit into the buffer. */ \ --outptr; \ diff --git a/iconvdata/jis0201.c b/iconvdata/jis0201.c index 1d0dd9fda4..e8cb83a93b 100644 --- a/iconvdata/jis0201.c +++ b/iconvdata/jis0201.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0201 handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0201.h b/iconvdata/jis0201.h index 46f51e5633..eae0ceffb0 100644 --- a/iconvdata/jis0201.h +++ b/iconvdata/jis0201.h @@ -1,5 +1,5 @@ /* Access functions for JISX0201 conversion. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0208.c b/iconvdata/jis0208.c index 9b45cf429b..7edc2b10bb 100644 --- a/iconvdata/jis0208.c +++ b/iconvdata/jis0208.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0208 handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h index 2b873e282e..cf8befafc7 100644 --- a/iconvdata/jis0208.h +++ b/iconvdata/jis0208.h @@ -1,5 +1,5 @@ /* Access functions for JISX0208 conversion. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0212.c b/iconvdata/jis0212.c index d34249a84a..98e51bc56a 100644 --- a/iconvdata/jis0212.c +++ b/iconvdata/jis0212.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0212 handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0212.h b/iconvdata/jis0212.h index 08690c1d1d..ae2583db0e 100644 --- a/iconvdata/jis0212.h +++ b/iconvdata/jis0212.h @@ -1,5 +1,5 @@ /* Access functions for JISX0212 conversion. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jisx0213.c b/iconvdata/jisx0213.c index 8a9046c70f..ade2f193c1 100644 --- a/iconvdata/jisx0213.c +++ b/iconvdata/jisx0213.c @@ -1,5 +1,5 @@ /* Mapping tables for JISX0213 character set. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/jisx0213.h b/iconvdata/jisx0213.h index 587499712b..e74dedf876 100644 --- a/iconvdata/jisx0213.h +++ b/iconvdata/jisx0213.h @@ -1,5 +1,5 @@ /* Functions for JISX0213 conversion. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/johab.c b/iconvdata/johab.c index fb280a368f..e52fc24022 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -1,5 +1,5 @@ /* Mapping tables for JOHAB handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu> and Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -150,6 +150,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from JOHAB to UCS4. */ @@ -192,7 +193,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) uint32_t ch2; \ uint_fast32_t idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -202,7 +203,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) \ ch2 = inptr[1]; \ idx = ch * 256 + ch2; \ - if (__builtin_expect (ch <= 0xd3, 1)) \ + if (__glibc_likely (ch <= 0xd3)) \ { \ /* Hangul */ \ int_fast32_t i, m, f; \ @@ -262,7 +263,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) } \ } \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ @@ -313,7 +314,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { \ if (ch >= 0xac00 && ch <= 0xd7a3) \ { \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -334,7 +335,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { \ ch = jamo_from_ucs_table[ch - 0x3131]; \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -355,7 +356,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) result = __GCONV_FULL_OUTPUT; \ break; \ } \ - if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (written == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ diff --git a/iconvdata/koi-8.c b/iconvdata/koi-8.c index 712ee8cddc..6fe30430a5 100644 --- a/iconvdata/koi-8.c +++ b/iconvdata/koi-8.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI-8. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/koi8-r.c b/iconvdata/koi8-r.c index 7f9c888f43..0a7d733c13 100644 --- a/iconvdata/koi8-r.c +++ b/iconvdata/koi8-r.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-R. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/koi8-ru.c b/iconvdata/koi8-ru.c index 83acbf3fd8..2f2cbca4ad 100644 --- a/iconvdata/koi8-ru.c +++ b/iconvdata/koi8-ru.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-RU. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 20077. diff --git a/iconvdata/koi8-t.c b/iconvdata/koi8-t.c index 419d438ce1..0330885330 100644 --- a/iconvdata/koi8-t.c +++ b/iconvdata/koi8-t.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-T. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/koi8-u.c b/iconvdata/koi8-u.c index b6d699ee0b..f1bea506c6 100644 --- a/iconvdata/koi8-u.c +++ b/iconvdata/koi8-u.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-U. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/ksc5601.c b/iconvdata/ksc5601.c index a94540d312..d28e598b7f 100644 --- a/iconvdata/ksc5601.c +++ b/iconvdata/ksc5601.c @@ -1,5 +1,5 @@ /* Conversion tables for KS C 5601-1992 based encoding conversion. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu>, 1998. diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h index 252dd3374c..1b9ea4a584 100644 --- a/iconvdata/ksc5601.h +++ b/iconvdata/ksc5601.h @@ -1,5 +1,5 @@ /* Access functions for KS C 5601-1992 based encoding conversion. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/iconvdata/latin-greek-1.c b/iconvdata/latin-greek-1.c index 5c57e57cef..f62ea94a5d 100644 --- a/iconvdata/latin-greek-1.c +++ b/iconvdata/latin-greek-1.c @@ -1,5 +1,5 @@ /* Conversion from and to LATIN-GREEK-1. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/latin-greek.c b/iconvdata/latin-greek.c index 58c351768d..97b6c56909 100644 --- a/iconvdata/latin-greek.c +++ b/iconvdata/latin-greek.c @@ -1,5 +1,5 @@ /* Conversion from and to LATIN-GREEK. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/mac-centraleurope.c b/iconvdata/mac-centraleurope.c index bd36a8fc6c..6cdb0c3a23 100644 --- a/iconvdata/mac-centraleurope.c +++ b/iconvdata/mac-centraleurope.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-CENTRALEUROPE. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/mac-is.c b/iconvdata/mac-is.c index 1b5bdc9902..a98fe14e20 100644 --- a/iconvdata/mac-is.c +++ b/iconvdata/mac-is.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-IS. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/mac-sami.c b/iconvdata/mac-sami.c index a20b07bb97..e4ed8390f9 100644 --- a/iconvdata/mac-sami.c +++ b/iconvdata/mac-sami.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-SAMI. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/mac-uk.c b/iconvdata/mac-uk.c index 03600b4d16..cc6cfd6eea 100644 --- a/iconvdata/mac-uk.c +++ b/iconvdata/mac-uk.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-UK. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/macintosh.c b/iconvdata/macintosh.c index 252998518f..58c26d215c 100644 --- a/iconvdata/macintosh.c +++ b/iconvdata/macintosh.c @@ -1,5 +1,5 @@ /* Conversion from and to MACINTOSH. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/mik.c b/iconvdata/mik.c index 00df1cdd8e..49ca9677ee 100644 --- a/iconvdata/mik.c +++ b/iconvdata/mik.c @@ -1,5 +1,5 @@ /* Conversion from and to MIK. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Alexander Shopov <ash@contact.bg>, 2006. diff --git a/iconvdata/nats-dano.c b/iconvdata/nats-dano.c index 8c21ff3a0e..24f37f0836 100644 --- a/iconvdata/nats-dano.c +++ b/iconvdata/nats-dano.c @@ -1,5 +1,5 @@ /* Conversion from and to NATS-DANO. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/nats-sefi.c b/iconvdata/nats-sefi.c index 70f5b95fa7..9677224df1 100644 --- a/iconvdata/nats-sefi.c +++ b/iconvdata/nats-sefi.c @@ -1,5 +1,5 @@ /* Conversion from and to NATS-SEFI. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/pt154.c b/iconvdata/pt154.c index a827de3337..f8ef9aaf07 100644 --- a/iconvdata/pt154.c +++ b/iconvdata/pt154.c @@ -1,5 +1,5 @@ /* Conversion from and to PT154. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. diff --git a/iconvdata/rk1048.c b/iconvdata/rk1048.c index c4fe46d6ff..37110176da 100644 --- a/iconvdata/rk1048.c +++ b/iconvdata/rk1048.c @@ -1,5 +1,5 @@ /* Conversion from and to RK1048. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh index e23f60d442..557db6b0ac 100755 --- a/iconvdata/run-iconv-test.sh +++ b/iconvdata/run-iconv-test.sh @@ -1,6 +1,6 @@ #! /bin/sh -f # Run available iconv(1) tests. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -21,7 +21,8 @@ set -e codir=$1 -test_wrapper="$2" +test_wrapper_env="$2" +run_program_env="$3" # We use always the same temporary file. temp1=$codir/iconvdata/iconv-test.xxx @@ -29,18 +30,13 @@ temp2=$codir/iconvdata/iconv-test.yyy trap "rm -f $temp1 $temp2" 1 2 3 15 -# We must tell the iconv(1) program where the modules we want to use can -# be found. -GCONV_PATH=$codir/iconvdata -export GCONV_PATH - # We have to have some directories in the library path. LIBPATH=$codir:$codir/iconvdata # How the start the iconv(1) program. ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \ $codir/iconv/iconv_prog' -ICONV="$test_wrapper $ICONV" +ICONV="$test_wrapper_env $run_program_env $ICONV" # Which echo? if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then @@ -188,6 +184,24 @@ while read utf8 from filename; do done < TESTS2 +# Check for crashes in decoders. +printf '\016\377\377\377\377\377\377\377' > $temp1 +for from in $iconv_modules ; do + echo $ac_n "test decoder $from $ac_c" + PROG=`eval echo $ICONV` + if $PROG -f $from -t UTF8 < $temp1 >/dev/null 2>&1 ; then + : # fall through + else + status=$? + if test $status -gt 1 ; then + echo "/FAILED" + failed=1 + continue + fi + fi + echo "OK" +done + exit $failed # Local Variables: # mode:shell-script diff --git a/iconvdata/sami-ws2.c b/iconvdata/sami-ws2.c index af486b112a..af05eff701 100644 --- a/iconvdata/sami-ws2.c +++ b/iconvdata/sami-ws2.c @@ -1,5 +1,5 @@ /* Conversion from and to SAMI-WS2. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/shift_jisx0213.c b/iconvdata/shift_jisx0213.c index 94a2d155d6..78a9aaac78 100644 --- a/iconvdata/shift_jisx0213.c +++ b/iconvdata/shift_jisx0213.c @@ -1,5 +1,5 @@ /* Conversion from and to Shift_JISX0213. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. @@ -43,6 +43,7 @@ #define TO_LOOP to_shift_jisx0213 #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -79,7 +80,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -92,7 +93,7 @@ } \ else \ { \ - if (__builtin_expect (outbuf + 2 <= outend, 1)) \ + if (__glibc_likely (outbuf + 2 <= outend)) \ { \ /* Write out the last character. */ \ uint32_t lasttwo = data->__statep->__count >> 3; \ @@ -119,7 +120,7 @@ \ /* Determine whether there is a buffered character pending. */ \ ch = *statep >> 3; \ - if (__builtin_expect (ch == 0, 1)) \ + if (__glibc_likely (ch == 0)) \ { \ /* No - so look at the next input byte. */ \ ch = *inptr; \ @@ -127,9 +128,9 @@ if (ch < 0x80) \ { \ /* Plain ISO646-JP character. */ \ - if (__builtin_expect (ch == 0x5c, 0)) \ + if (__glibc_unlikely (ch == 0x5c)) \ ch = 0xa5; \ - else if (__builtin_expect (ch == 0x7e, 0)) \ + else if (__glibc_unlikely (ch == 0x7e)) \ ch = 0x203e; \ ++inptr; \ } \ @@ -144,7 +145,7 @@ /* Two byte character. */ \ uint32_t ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second byte is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -154,7 +155,7 @@ ch2 = inptr[1]; \ \ /* The second byte must be in the range 0x{40..7E,80..FC}. */ \ - if (__builtin_expect (ch2 < 0x40 || ch2 == 0x7f || ch2 > 0xfc, 0))\ + if (__glibc_unlikely (ch2 < 0x40 || ch2 == 0x7f || ch2 > 0xfc)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -332,7 +333,7 @@ static const struct if (len > 0) \ { \ /* Output the combined character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -347,7 +348,7 @@ static const struct \ not_combining: \ /* Output the buffered character. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -421,7 +422,7 @@ static const struct } \ \ /* Output the shifted representation. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index 34df564201..6caae2c2bb 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -1,5 +1,5 @@ /* Mapping tables for SJIS handling. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -4320,6 +4320,7 @@ static const char from_ucs4_extra[0x100][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from SJIS to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -4361,7 +4362,7 @@ static const char from_ucs4_extra[0x100][2] = uint32_t ch2; \ uint_fast32_t idx; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second byte is not available. Store \ the intermediate result. */ \ @@ -4371,7 +4372,7 @@ static const char from_ucs4_extra[0x100][2] = \ ch2 = inptr[1]; \ idx = ch * 256 + ch2; \ - if (__builtin_expect (ch2 < 0x40, 0)) \ + if (__glibc_unlikely (ch2 < 0x40)) \ { \ /* This is illegal. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \ @@ -4398,7 +4399,7 @@ static const char from_ucs4_extra[0x100][2] = else \ ch = cjk_block4[(ch - 0xe0) * 192 + ch2 - 0x40]; \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ @@ -4469,7 +4470,7 @@ static const char from_ucs4_extra[0x100][2] = /* Now test for a possible second byte and write this if possible. */\ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ /* The result does not fit into the buffer. */ \ result = __GCONV_FULL_OUTPUT; \ diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index e820eb907c..6c8703e02a 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -1,5 +1,5 @@ /* Generic conversion to and from T.61. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -373,6 +373,7 @@ static const char from_ucs4[][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from T.61 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -390,7 +391,7 @@ static const char from_ucs4[][2] = is also available. */ \ uint32_t ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -487,7 +488,7 @@ static const char from_ucs4[][2] = /* Now test for a possible second byte and write this if possible. */ \ if (cp[1] != '\0') \ { \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ /* The result does not fit into the buffer. */ \ --outptr; \ diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c index 7a3ab455fa..e853da8e79 100644 --- a/iconvdata/tcvn5712-1.c +++ b/iconvdata/tcvn5712-1.c @@ -1,5 +1,5 @@ /* Conversion to and from TCVN5712-1. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. @@ -29,6 +29,7 @@ #define TO_LOOP to_tcvn5712_1 #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 1 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -64,7 +65,7 @@ { \ if (FROM_DIRECTION) \ { \ - if (__builtin_expect (outbuf + 4 <= outend, 1)) \ + if (__glibc_likely (outbuf + 4 <= outend)) \ { \ /* Write out the last character. */ \ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ @@ -652,7 +653,7 @@ static const struct res = 0; \ } \ \ - if (__builtin_expect (res != 0, 1)) \ + if (__glibc_likely (res != 0)) \ { \ *outptr++ = res; \ inptr += 4; \ @@ -696,7 +697,7 @@ static const struct } \ \ /* See whether we have room for two bytes. */ \ - if (__builtin_expect (outptr + 1 >= outend, 0)) \ + if (__glibc_unlikely (outptr + 1 >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/tis-620.c b/iconvdata/tis-620.c index 963551c511..1feac0ba41 100644 --- a/iconvdata/tis-620.c +++ b/iconvdata/tis-620.c @@ -1,5 +1,5 @@ /* Conversion from and to TIS-620. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/tscii.c b/iconvdata/tscii.c index e8363d12c9..b945772f69 100644 --- a/iconvdata/tscii.c +++ b/iconvdata/tscii.c @@ -1,5 +1,5 @@ /* Conversion from and to TSCII. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. @@ -38,6 +38,7 @@ #define TO_LOOP to_tscii #define DEFINE_INIT 1 #define DEFINE_FINI 1 +#define ONE_DIRECTION 0 #define FROM_LOOP_MIN_NEEDED_FROM 1 #define FROM_LOOP_MAX_NEEDED_FROM 2 #define FROM_LOOP_MIN_NEEDED_TO 4 @@ -90,7 +91,7 @@ { \ do \ { \ - if (__builtin_expect (outbuf + 4 > outend, 0)) \ + if (__glibc_unlikely (outbuf + 4 > outend)) \ { \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ @@ -108,10 +109,10 @@ else \ { \ uint32_t last = data->__statep->__count >> 3; \ - if (__builtin_expect (last >> 8, 0)) \ + if (__glibc_unlikely (last >> 8)) \ { \ /* Write out the last character, two bytes. */ \ - if (__builtin_expect (outbuf + 2 <= outend, 1)) \ + if (__glibc_likely (outbuf + 2 <= outend)) \ { \ *outbuf++ = last & 0xff; \ *outbuf++ = (last >> 8) & 0xff; \ @@ -124,7 +125,7 @@ else \ { \ /* Write out the last character, a single byte. */ \ - if (__builtin_expect (outbuf < outend, 1)) \ + if (__glibc_likely (outbuf < outend)) \ { \ *outbuf++ = last & 0xff; \ data->__statep->__count = 0; \ @@ -384,7 +385,7 @@ static const uint32_t tscii_next_state[6] = /* See whether we have room for two characters. Otherwise \ store only the first character now, and put the second \ one into the queue. */ \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = u2 << 8; \ result = __GCONV_FULL_OUTPUT; \ @@ -421,7 +422,7 @@ static const uint32_t tscii_next_state[6] = inptr++; \ put32 (outptr, 0x0BB8); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BCD << 8) + (4 << 4); \ result = __GCONV_FULL_OUTPUT; \ @@ -429,7 +430,7 @@ static const uint32_t tscii_next_state[6] = } \ put32 (outptr, 0x0BCD); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BB0 << 8) + (2 << 4); \ result = __GCONV_FULL_OUTPUT; \ @@ -437,7 +438,7 @@ static const uint32_t tscii_next_state[6] = } \ put32 (outptr, 0x0BB0); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BC0 << 8); \ result = __GCONV_FULL_OUTPUT; \ @@ -454,7 +455,7 @@ static const uint32_t tscii_next_state[6] = inptr++; \ put32 (outptr, 0x0B95); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BCD << 8) + (1 << 4); \ result = __GCONV_FULL_OUTPUT; \ @@ -462,7 +463,7 @@ static const uint32_t tscii_next_state[6] = } \ put32 (outptr, 0x0BCD); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BB7 << 8); \ result = __GCONV_FULL_OUTPUT; \ @@ -479,7 +480,7 @@ static const uint32_t tscii_next_state[6] = inptr++; \ put32 (outptr, 0x0B95); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BCD << 8) + (5 << 4); \ result = __GCONV_FULL_OUTPUT; \ @@ -487,7 +488,7 @@ static const uint32_t tscii_next_state[6] = } \ put32 (outptr, 0x0BCD); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BB7 << 8) + (3 << 4); \ result = __GCONV_FULL_OUTPUT; \ @@ -495,7 +496,7 @@ static const uint32_t tscii_next_state[6] = } \ put32 (outptr, 0x0BB7); \ outptr += 4; \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ *statep = (0x0BCD << 8); \ result = __GCONV_FULL_OUTPUT; \ @@ -592,7 +593,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BC6) \ { \ - if (__builtin_expect (outptr + 2 <= outend, 1)) \ + if (__glibc_likely (outptr + 2 <= outend)) \ { \ *outptr++ = 0xa6; \ *outptr++ = last; \ @@ -608,7 +609,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BC7) \ { \ - if (__builtin_expect (outptr + 2 <= outend, 1)) \ + if (__glibc_likely (outptr + 2 <= outend)) \ { \ *outptr++ = 0xa7; \ *outptr++ = last; \ @@ -624,7 +625,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BC8) \ { \ - if (__builtin_expect (outptr + 2 <= outend, 1)) \ + if (__glibc_likely (outptr + 2 <= outend)) \ { \ *outptr++ = 0xa8; \ *outptr++ = last; \ @@ -640,7 +641,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BCA) \ { \ - if (__builtin_expect (outptr + 3 <= outend, 1)) \ + if (__glibc_likely (outptr + 3 <= outend)) \ { \ *outptr++ = 0xa6; \ *outptr++ = last; \ @@ -657,7 +658,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BCB) \ { \ - if (__builtin_expect (outptr + 3 <= outend, 1)) \ + if (__glibc_likely (outptr + 3 <= outend)) \ { \ *outptr++ = 0xa7; \ *outptr++ = last; \ @@ -674,7 +675,7 @@ static const uint8_t consonant_with_virama[18] = } \ if (ch == 0x0BCC) \ { \ - if (__builtin_expect (outptr + 3 <= outend, 1)) \ + if (__glibc_likely (outptr + 3 <= outend)) \ { \ *outptr++ = 0xa7; \ *outptr++ = last; \ @@ -771,9 +772,9 @@ static const uint8_t consonant_with_virama[18] = } \ \ /* Output the buffered character. */ \ - if (__builtin_expect (last >> 8, 0)) \ + if (__glibc_unlikely (last >> 8)) \ { \ - if (__builtin_expect (outptr + 2 <= outend, 1)) \ + if (__glibc_likely (outptr + 2 <= outend)) \ { \ *outptr++ = last & 0xff; \ *outptr++ = (last >> 8) & 0xff; \ @@ -808,7 +809,7 @@ static const uint8_t consonant_with_virama[18] = else if (ch >= 0x0BCA && ch <= 0x0BCC) \ { \ /* See whether we have room for two bytes. */ \ - if (__builtin_expect (outptr + 2 <= outend, 1)) \ + if (__glibc_likely (outptr + 2 <= outend)) \ { \ *outptr++ = (ch == 0x0BCA ? 0xa6 : 0xa7); \ *outptr++ = (ch != 0x0BCC ? 0xa1 : 0xaa); \ diff --git a/iconvdata/tst-e2big.c b/iconvdata/tst-e2big.c index 9533eb0657..a0acc8cb67 100644 --- a/iconvdata/tst-e2big.c +++ b/iconvdata/tst-e2big.c @@ -1,5 +1,5 @@ /* Test for a tricky E2BIG situation. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. @@ -95,10 +95,13 @@ test_tscii (void) test ("TSCII", inbuf, sizeof (inbuf), 9); } -int -main (void) +static int +do_test (void) { test_euc_jisx0213 (); test_tscii (); return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c index 0d8a9590d5..3275005dc8 100644 --- a/iconvdata/tst-loading.c +++ b/iconvdata/tst-loading.c @@ -1,5 +1,5 @@ /* Tests for loading and unloading of iconv modules. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -114,8 +114,8 @@ static const char inbuf[] = " function. Later modifications of the variable have no effect.\n"; -int -main (void) +static int +do_test (void) { size_t count = TEST_ROUNDS; int result = 0; @@ -180,3 +180,7 @@ main (void) return result; } + +#define TIMEOUT 10 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/iconvdata/tst-table-charmap.sh b/iconvdata/tst-table-charmap.sh index 04cddc3301..db33f1ea00 100755 --- a/iconvdata/tst-table-charmap.sh +++ b/iconvdata/tst-table-charmap.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c index 95072f9908..59780ba3ae 100644 --- a/iconvdata/tst-table-from.c +++ b/iconvdata/tst-table-from.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2014 Free Software Foundation, Inc. +/* Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/iconvdata/tst-table-to.c b/iconvdata/tst-table-to.c index 82fb779a95..d76463f710 100644 --- a/iconvdata/tst-table-to.c +++ b/iconvdata/tst-table-to.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2014 Free Software Foundation, Inc. +/* Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh index c68a3b9f01..528b78c89b 100755 --- a/iconvdata/tst-table.sh +++ b/iconvdata/tst-table.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # @@ -27,8 +27,7 @@ test_program_prefix=$3 charset=$4 charmap=$5 -GCONV_PATH=${common_objpfx}iconvdata -export GCONV_PATH +# sort is used on the build system. LC_ALL=C export LC_ALL diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index 116d88ed7a..73d9400b8a 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c index 4f5e71486d..d075900ad8 100644 --- a/iconvdata/uhc.c +++ b/iconvdata/uhc.c @@ -1,5 +1,5 @@ /* Mapping tables for UHC handling. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu>, 1998. @@ -3044,6 +3044,7 @@ static const char uhc_hangul_from_ucs[11172][2] = #define MIN_NEEDED_FROM 1 #define MAX_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 /* First define the conversion function from UHC to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM @@ -3076,7 +3077,7 @@ static const char uhc_hangul_from_ucs[11172][2] = is also available. */ \ uint32_t ch2; \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store \ the intermediate result. */ \ @@ -3123,7 +3124,7 @@ static const char uhc_hangul_from_ucs[11172][2] = ? (ch - 0x81) * 178 \ : 5696 + (ch - 0xa1) * 84)]; \ \ - if (__builtin_expect (ch == 0, 0)) \ + if (__glibc_unlikely (ch == 0)) \ { \ /* This is an illegal character. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (2); \ @@ -3173,7 +3174,7 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ const char *s = uhc_hangul_from_ucs[ch - 0xac00]; \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -3186,12 +3187,12 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ size_t written = ucs4_to_ksc5601_hanja (ch, outptr, outend - outptr); \ \ - if (__builtin_expect (written == 0, 0)) \ + if (__glibc_unlikely (written == 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ } \ - if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0)) \ + if (__glibc_unlikely (written == __UNKNOWN_10646_CHAR)) \ { \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ @@ -3213,7 +3214,7 @@ static const char uhc_hangul_from_ucs[11172][2] = UNICODE_TAG_HANDLER (ch, 4); \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ - if (__builtin_expect (written == 0, 0)) \ + if (__glibc_unlikely (written == 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c index 00d63ef338..b70d044047 100644 --- a/iconvdata/unicode.c +++ b/iconvdata/unicode.c @@ -1,5 +1,5 @@ /* Conversion module for Unicode - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -38,6 +38,7 @@ #define DEFINE_FINI 0 #define MIN_NEEDED_FROM 2 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define FROM_DIRECTION (dir == from_unicode) #define PREPARE_LOOP \ enum direction dir = ((struct unicode_data *) step->__data)->dir; \ @@ -64,7 +65,7 @@ else if (!data->__internal_use && data->__invocation_counter == 0) \ { \ /* Emit the Byte Order Mark. */ \ - if (__builtin_expect (outbuf + 2 > outend, 0)) \ + if (__glibc_unlikely (outbuf + 2 > outend)) \ return __GCONV_FULL_OUTPUT; \ \ put16u (outbuf, BOM); \ @@ -150,12 +151,12 @@ gconv_end (struct __gconv_step *data) { \ uint32_t c = get32 (inptr); \ \ - if (__builtin_expect (c >= 0x10000, 0)) \ + if (__glibc_unlikely (c >= 0x10000)) \ { \ UNICODE_TAG_HANDLER (c, 4); \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ - else if (__builtin_expect (c >= 0xd800 && c < 0xe000, 0)) \ + else if (__glibc_unlikely (c >= 0xd800 && c < 0xe000)) \ { \ /* Surrogate characters in UCS-4 input are not valid. \ We must catch this, because the UCS-2 output might be \ @@ -195,7 +196,7 @@ gconv_end (struct __gconv_step *data) if (swap) \ u1 = bswap_16 (u1); \ \ - if (__builtin_expect (u1 >= 0xd800 && u1 < 0xe000, 0)) \ + if (__glibc_unlikely (u1 >= 0xd800 && u1 < 0xe000)) \ { \ /* Surrogate characters in UCS-2 input are not valid. Reject \ them. (Catching this here is not security relevant.) */ \ diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index 43be4be9c1..75dbe9303f 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-16. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -39,11 +39,12 @@ #define MIN_NEEDED_FROM 2 #define MAX_NEEDED_FROM 4 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define FROM_DIRECTION (dir == from_utf16) #define PREPARE_LOOP \ enum direction dir = ((struct utf16_data *) step->__data)->dir; \ enum variant var = ((struct utf16_data *) step->__data)->var; \ - if (__builtin_expect (data->__invocation_counter == 0, 0)) \ + if (__glibc_unlikely (data->__invocation_counter == 0)) \ { \ if (var == UTF_16) \ { \ @@ -67,7 +68,7 @@ else if (!FROM_DIRECTION && !data->__internal_use) \ { \ /* Emit the Byte Order Mark. */ \ - if (__builtin_expect (outbuf + 2 > outend, 0)) \ + if (__glibc_unlikely (outbuf + 2 > outend)) \ return __GCONV_FULL_OUTPUT; \ \ put16u (outbuf, BOM); \ @@ -200,7 +201,7 @@ gconv_end (struct __gconv_step *data) { \ uint32_t c = get32 (inptr); \ \ - if (__builtin_expect (c >= 0xd800 && c < 0xe000, 0)) \ + if (__glibc_unlikely (c >= 0xd800 && c < 0xe000)) \ { \ /* Surrogate characters in UCS-4 input are not valid. \ We must catch this. If we let surrogates pass through, \ @@ -216,15 +217,15 @@ gconv_end (struct __gconv_step *data) \ if (swap) \ { \ - if (__builtin_expect (c >= 0x10000, 0)) \ + if (__glibc_unlikely (c >= 0x10000)) \ { \ - if (__builtin_expect (c >= 0x110000, 0)) \ + if (__glibc_unlikely (c >= 0x110000)) \ { \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ \ /* Generate a surrogate character. */ \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ /* Overflow in the output buffer. */ \ result = __GCONV_FULL_OUTPUT; \ @@ -240,15 +241,15 @@ gconv_end (struct __gconv_step *data) } \ else \ { \ - if (__builtin_expect (c >= 0x10000, 0)) \ + if (__glibc_unlikely (c >= 0x10000)) \ { \ - if (__builtin_expect (c >= 0x110000, 0)) \ + if (__glibc_unlikely (c >= 0x110000)) \ { \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ \ /* Generate a surrogate character. */ \ - if (__builtin_expect (outptr + 4 > outend, 0)) \ + if (__glibc_unlikely (outptr + 4 > outend)) \ { \ /* Overflow in the output buffer. */ \ result = __GCONV_FULL_OUTPUT; \ @@ -296,7 +297,7 @@ gconv_end (struct __gconv_step *data) \ /* It's a surrogate character. At least the first word says \ it is. */ \ - if (__builtin_expect (inptr + 4 > inend, 0)) \ + if (__glibc_unlikely (inptr + 4 > inend)) \ { \ /* We don't have enough input for another complete input \ character. */ \ @@ -330,7 +331,7 @@ gconv_end (struct __gconv_step *data) { \ /* It's a surrogate character. At least the first word says \ it is. */ \ - if (__builtin_expect (inptr + 4 > inend, 0)) \ + if (__glibc_unlikely (inptr + 4 > inend)) \ { \ /* We don't have enough input for another complete input \ character. */ \ diff --git a/iconvdata/utf-32.c b/iconvdata/utf-32.c index f21f2be041..939502b618 100644 --- a/iconvdata/utf-32.c +++ b/iconvdata/utf-32.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-32. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,6 +37,7 @@ #define DEFINE_FINI 0 #define MIN_NEEDED_FROM 4 #define MIN_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define FROM_DIRECTION (dir == from_utf32) #define PREPARE_LOOP \ enum direction dir = ((struct utf32_data *) step->__data)->dir; \ @@ -44,7 +45,7 @@ int swap; \ if (FROM_DIRECTION && var == UTF_32) \ { \ - if (__builtin_expect (data->__invocation_counter == 0, 0)) \ + if (__glibc_unlikely (data->__invocation_counter == 0)) \ { \ /* We have to find out which byte order the file is encoded in. */ \ if (inptr + 4 > inend) \ @@ -65,7 +66,7 @@ && data->__invocation_counter == 0) \ { \ /* Emit the Byte Order Mark. */ \ - if (__builtin_expect (outbuf + 4 > outend, 0)) \ + if (__glibc_unlikely (outbuf + 4 > outend)) \ return __GCONV_FULL_OUTPUT; \ \ put32u (outbuf, BOM); \ @@ -196,11 +197,11 @@ gconv_end (struct __gconv_step *data) { \ uint32_t c = get32 (inptr); \ \ - if (__builtin_expect (c >= 0x110000, 0)) \ + if (__glibc_unlikely (c >= 0x110000)) \ { \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ - else if (__builtin_expect (c >= 0xd800 && c < 0xe000, 0)) \ + else if (__glibc_unlikely (c >= 0xd800 && c < 0xe000)) \ { \ /* Surrogate characters in UCS-4 input are not valid. \ We must catch this. If we let surrogates pass through, \ @@ -238,7 +239,7 @@ gconv_end (struct __gconv_step *data) if (swap) \ u1 = bswap_32 (u1); \ \ - if (__builtin_expect (u1 >= 0x110000, 0)) \ + if (__glibc_unlikely (u1 >= 0x110000)) \ { \ /* This is illegal. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (4); \ diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c index 17a9fea656..df6fe0390b 100644 --- a/iconvdata/utf-7.c +++ b/iconvdata/utf-7.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-7. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. @@ -120,6 +120,7 @@ base64 (unsigned int i) #define MAX_NEEDED_FROM 6 #define MIN_NEEDED_TO 4 #define MAX_NEEDED_TO 4 +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ mbstate_t saved_state; \ mbstate_t *statep = data->__statep; @@ -167,9 +168,9 @@ base64 (unsigned int i) put32 (outptr, ch); \ outptr += 4; \ } \ - else if (__builtin_expect (ch == '+', 1)) \ + else if (__glibc_likely (ch == '+')) \ { \ - if (__builtin_expect (inptr + 2 > inend, 0)) \ + if (__glibc_unlikely (inptr + 2 > inend)) \ { \ /* Not enough input available. */ \ result = __GCONV_INCOMPLETE_INPUT; \ @@ -340,7 +341,7 @@ base64 (unsigned int i) else \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ \ - if (__builtin_expect (outptr + count > outend, 0)) \ + if (__glibc_unlikely (outptr + count > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -381,7 +382,7 @@ base64 (unsigned int i) size_t count; \ \ count = ((statep->__count & 0x18) >= 0x10) + isxbase64 (ch) + 1; \ - if (__builtin_expect (outptr + count > outend, 0)) \ + if (__glibc_unlikely (outptr + count > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -405,7 +406,7 @@ base64 (unsigned int i) else \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ \ - if (__builtin_expect (outptr + count > outend, 0)) \ + if (__glibc_unlikely (outptr + count > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -509,7 +510,7 @@ base64 (unsigned int i) /* Deactivate base64 encoding. */ \ size_t count = ((state & 0x18) >= 0x10) + 1; \ \ - if (__builtin_expect (outbuf + count > outend, 0)) \ + if (__glibc_unlikely (outbuf + count > outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ diff --git a/iconvdata/viscii.c b/iconvdata/viscii.c index f73ad3e243..8d19f6b3f7 100644 --- a/iconvdata/viscii.c +++ b/iconvdata/viscii.c @@ -1,5 +1,5 @@ /* Conversion from and to VISCII. - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. |