This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.13-165-g0656e90
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 May 2011 05:03:38 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-165-g0656e90
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 0656e90edc091f122284b602d2d590314e40c97a (commit)
from 1af4e29837e9969377781b47254b6e4c293353ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0656e90edc091f122284b602d2d590314e40c97a
commit 0656e90edc091f122284b602d2d590314e40c97a
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat May 14 01:03:08 2011 -0400
Optimize conversion of single character in gconv
diff --git a/ChangeLog b/ChangeLog
index 6c125e3..36a3708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
2011-05-14 Ulrich Drepper <drepper@gmail.com>
* iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before
- storing incomplete byte sequence in state object.
+ storing incomplete byte sequence in state object. Avoid testing for
+ guaranteed too small input if we know there is enough data available.
2011-05-11 Andreas Schwab <schwab@redhat.com>
diff --git a/iconv/loop.c b/iconv/loop.c
index 72fef94..4f43062 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -395,7 +395,8 @@ SINGLE(LOOPFCT) (struct __gconv_step *step,
#endif
/* Are there enough bytes in the input buffer? */
- if (__builtin_expect (inptr + (MIN_NEEDED_INPUT - inlen) > inend, 0))
+ if (MIN_NEEDED_INPUT > 1
+ && __builtin_expect (inptr + (MIN_NEEDED_INPUT - inlen) > inend, 0))
{
*inptrp = inend;
#ifdef STORE_REST
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 ++-
iconv/loop.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources