Update.

2000-04-20  Ulrich Drepper  <drepper@redhat.com>

	* iconv/skeleton.c: Add some more __builtin_expect.
	* iconv/loop.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2c57fc4..1b54df5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * iconv/skeleton.c: Add some more __builtin_expect.
+       * iconv/loop.c: Likewise.
+
 2000-03-08  H.J. Lu  <hjl@gnu.org>
 
        * posix/regex.c (regex_compile): Correctly handle "\{" when

diff --git a/iconv/loop.c b/iconv/loop.c
index ffdd24d..c8f8934 100644 (file)
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -307,7 +307,7 @@ SINGLE(LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 #endif
 
   /* Are there enough bytes in the input buffer?  */
-  if (inptr + (MAX_NEEDED_INPUT - inlen) > inend)
+  if (__builtin_expect (inptr + (MAX_NEEDED_INPUT - inlen) > inend, 0))
     {
 #ifdef STORE_REST
       *inptrp = inend;

diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 50ee45d..81677cc 100644 (file)
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -281,7 +281,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
   /* If the function is called with no input this means we have to reset
      to the initial state.  The possibly partly converted input is
      dropped.  */
-  if (do_flush)
+  if (__builtin_expect (do_flush, 0))
     {
       status = __GCONV_OK;
 
@@ -439,7 +439,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
 
              if (result != __GCONV_EMPTY_INPUT)
                {
-                 if (outerr != outbuf)
+                 if (__builtin_expect (outerr != outbuf, 0))
                    {
 #ifdef RESET_INPUT_BUFFER
                      RESET_INPUT_BUFFER;