projects
/
framework
/
base
/
tizen-locale.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen 2.4 release
[framework/base/tizen-locale.git]
/
iconvdata
/
t.61.c
diff --git
a/iconvdata/t.61.c
b/iconvdata/t.61.c
index
1e84fe9
..
6c8703e
100644
(file)
--- a/
iconvdata/t.61.c
+++ b/
iconvdata/t.61.c
@@
-1,5
+1,5
@@
/* Generic conversion to and from T.61.
/* Generic conversion to and from T.61.
- Copyright (C) 1997-
1999, 2000-2002
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.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@
-14,9
+14,8
@@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include <dlfcn.h>
#include <gconv.h>
#include <dlfcn.h>
#include <gconv.h>
@@
-374,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 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
/* First define the conversion function from T.61 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
@@
-391,7
+391,7
@@
static const char from_ucs4[][2] =
is also available. */ \
uint32_t ch2; \
\
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; \
{ \
/* The second character is not available. */ \
result = __GCONV_INCOMPLETE_INPUT; \
@@
-488,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') \
{ \
/* 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; \
{ \
/* The result does not fit into the buffer. */ \
--outptr; \