summaryrefslogtreecommitdiff
path: root/src/fcstr.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-08-24 07:59:50 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-08-25 12:15:45 -0400
commit51d40491fc483787ba66fb76344ff7d4c13a39b3 (patch)
treed032c2563c33cbba7321a3e31a263127eea0dba8 /src/fcstr.c
parent76699a4813a05fd89114a29965d2532adc1553b0 (diff)
downloadfontconfig-51d40491fc483787ba66fb76344ff7d4c13a39b3.tar.gz
Use FC_UNLIKELY
Diffstat (limited to 'src/fcstr.c')
-rw-r--r--src/fcstr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fcstr.c b/src/fcstr.c
index f1f75dc..8971b71 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -164,7 +164,7 @@ FcStrCaseWalkerNextNonDelim (FcCaseWalker *w, const char *delims)
{
FcChar8 r;
- if (__builtin_expect (w->read != NULL, 0))
+ if (FC_UNLIKELY (w->read != NULL))
{
if ((r = *w->read++))
return r;
@@ -175,7 +175,7 @@ FcStrCaseWalkerNextNonDelim (FcCaseWalker *w, const char *delims)
r = *w->src++;
} while (r != 0 && delims && strchr (delims, r));
- if (__builtin_expect ((r & 0xc0) == 0xc0, 0))
+ if (FC_UNLIKELY ((r & 0xc0) == 0xc0))
return FcStrCaseWalkerLong (w, r);
if ('A' <= r && r <= 'Z')
r = r - 'A' + 'a';
@@ -187,7 +187,7 @@ FcStrCaseWalkerNextNonBlank (FcCaseWalker *w)
{
FcChar8 r;
- if (__builtin_expect (w->read != NULL, 0))
+ if (FC_UNLIKELY (w->read != NULL))
{
if ((r = *w->read++))
return r;
@@ -198,7 +198,7 @@ FcStrCaseWalkerNextNonBlank (FcCaseWalker *w)
r = *w->src++;
} while (r == ' ');
- if (__builtin_expect ((r & 0xc0) == 0xc0, 0))
+ if (FC_UNLIKELY ((r & 0xc0) == 0xc0))
return FcStrCaseWalkerLong (w, r);
if ('A' <= r && r <= 'Z')
r = r - 'A' + 'a';
@@ -210,7 +210,7 @@ FcStrCaseWalkerNext (FcCaseWalker *w)
{
FcChar8 r;
- if (__builtin_expect (w->read != NULL, 0))
+ if (FC_UNLIKELY (w->read != NULL))
{
if ((r = *w->read++))
return r;
@@ -219,7 +219,7 @@ FcStrCaseWalkerNext (FcCaseWalker *w)
r = *w->src++;
- if (__builtin_expect ((r & 0xc0) == 0xc0, 0))
+ if (FC_UNLIKELY ((r & 0xc0) == 0xc0))
return FcStrCaseWalkerLong (w, r);
if ('A' <= r && r <= 'Z')
r = r - 'A' + 'a';