diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-06 06:49:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-06 06:49:00 +0000 |
| commit | 5ea1a82defd37feaa6be1faf44854364c901cdaf (patch) | |
| tree | 9fad50dfb181485bb4ca62c9d96e0d31376dce07 /iconv/gconv_db.c | |
| parent | 365afefc6b7054d9ca7585f6f17bdd1fe03b8cfd (diff) | |
| download | glibc-5ea1a82defd37feaa6be1faf44854364c901cdaf.tar.gz | |
Update.
* iconvdata/big5hkscs.c: Add __builtin_expect in many places.
* iconvdata/big5.c: Likewise.
* iconvdata/ansi_x3.110.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconv/loop.c: Likewise.
* iconv/gconv_db.c: Likewise.
* iconv/gconv_dl.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/skeleton.c: Likewise.
Diffstat (limited to 'iconv/gconv_db.c')
| -rw-r--r-- | iconv/gconv_db.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index f4a86e0cd0..2e951294e4 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -1,5 +1,5 @@ /* Provide access to the collection of available transformation modules. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -239,7 +239,7 @@ gen_steps (struct derivation_step *best, const char *toset, status = DL_CALL_FCT (result[step_cnt].__init_fct, (&result[step_cnt])); - if (status != __GCONV_OK) + if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK) { failed = 1; /* Make sure we unload this modules. */ @@ -251,7 +251,7 @@ gen_steps (struct derivation_step *best, const char *toset, current = current->last; } - if (failed != 0) + if (__builtin_expect (failed, 0) != 0) { /* Something went wrong while initializing the modules. */ while (++step_cnt < *nsteps) @@ -670,7 +670,7 @@ __gconv_find_transform (const char *toset, const char *fromset, toset_expand = found != NULL ? (*found)->toname : NULL; } - if ((flags & GCONV_AVOID_NOCONV) + if (__builtin_expect (flags & GCONV_AVOID_NOCONV, 0) /* We are not supposed to create a pseudo transformation (means copying) when the input and output character set are the same. */ && (strcmp (toset, fromset) == 0 |