diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 14:45:42 +0100 |
|---|---|---|
| committer | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 15:07:12 +0100 |
| commit | a1ffb40e32741f992c743e7b16c061fefa3747ac (patch) | |
| tree | 246a29a87b26cfd5d07b17070f85eb3785018de9 /stdio-common/printf_fp.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.bz2 glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.zip | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'stdio-common/printf_fp.c')
| -rw-r--r-- | stdio-common/printf_fp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 7a3292cf97..9cd4b4b00c 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -1094,7 +1094,7 @@ ___printf_fp (FILE *fp, /* Write the exponent if it is needed. */ if (type != 'f') { - if (__builtin_expect (expsign != 0 && exponent == 4 && spec == 'g', 0)) + if (__glibc_unlikely (expsign != 0 && exponent == 4 && spec == 'g')) { /* This is another special case. The exponent of the number is really smaller than -4, which requires the 'e'/'E' format. @@ -1180,7 +1180,7 @@ ___printf_fp (FILE *fp, size_t nbuffer = (2 + chars_needed * factor + decimal_len + ngroups * thousands_sep_len); - if (__builtin_expect (buffer_malloced, 0)) + if (__glibc_unlikely (buffer_malloced)) { buffer = (char *) malloc (nbuffer); if (buffer == NULL) @@ -1208,7 +1208,7 @@ ___printf_fp (FILE *fp, } tmpptr = buffer; - if (__builtin_expect (info->i18n, 0)) + if (__glibc_unlikely (info->i18n)) { #ifdef COMPILE_WPRINTF wstartp = _i18n_number_rewrite (wstartp, wcp, @@ -1228,7 +1228,7 @@ ___printf_fp (FILE *fp, PRINT (tmpptr, wstartp, wide ? wcp - wstartp : cp - tmpptr); /* Free the memory if necessary. */ - if (__builtin_expect (buffer_malloced, 0)) + if (__glibc_unlikely (buffer_malloced)) { free (buffer); free (wbuffer); |