diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-10-30 13:24:13 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-10-30 13:24:13 +0100 |
| commit | 83ee97498db28cb3e092f26f1a9169fbff1b1c6e (patch) | |
| tree | 0eaec2083184795dc47437792976be5c6fa09dd2 /src/conntrack/objopt.c | |
| parent | 93c459d603cc7a3d9cadeb0844364d5e59aa267c (diff) | |
API: use of __builtin_expect in error checking paths
This patch introduces likely() and unlikely() that use
__builtin_expect to assist the compiler in the branch decisions.
I am assuming that we have no clients of libnetfilter_conntrack
that use gcc < 2.96.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/conntrack/objopt.c')
| -rw-r--r-- | src/conntrack/objopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conntrack/objopt.c b/src/conntrack/objopt.c index 822215f..682cba1 100644 --- a/src/conntrack/objopt.c +++ b/src/conntrack/objopt.c @@ -83,7 +83,7 @@ setobjopt setobjopt_array[] = { int __setobjopt(struct nf_conntrack *ct, unsigned int option) { - if (option > NFCT_SOPT_MAX) + if (unlikely(option > NFCT_SOPT_MAX)) return -1; setobjopt_array[option](ct); @@ -131,7 +131,7 @@ getobjopt getobjopt_array[] = { int __getobjopt(const struct nf_conntrack *ct, unsigned int option) { - if (option > NFCT_GOPT_MAX) + if (unlikely(option > NFCT_GOPT_MAX)) return -1; return getobjopt_array[option](ct); |