diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-18 20:01:27 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-18 20:08:25 +0200 |
commit | 6cdc49ffbe0a672c27f4fffe831563b12a8e2e61 (patch) | |
tree | 76e1b5318bfdd9627f8ab5138293cbe569c25da4 /src/set.c | |
parent | 5ecac519cd78043d0a5bfead1922a683d32db9d2 (diff) |
src: simplify getter logic
This patch refactors the getter code to simplify it. The default
cases have been removed so gcc will spot a warning if an attribute
is not handled appropriately.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/set.c')
-rw-r--r-- | src/set.c | 37 |
1 files changed, 11 insertions, 26 deletions
@@ -148,41 +148,26 @@ EXPORT_SYMBOL(nft_set_attr_set_str); void *nft_set_attr_get(struct nft_set *s, uint16_t attr) { + if (!(s->flags & (1 << attr))) + return NULL; + switch(attr) { case NFT_SET_ATTR_TABLE: - if (s->flags & (1 << NFT_SET_ATTR_TABLE)) - return s->table; - break; + return s->table; case NFT_SET_ATTR_NAME: - if (s->flags & (1 << NFT_SET_ATTR_NAME)) - return s->name; - break; + return s->name; case NFT_SET_ATTR_FLAGS: - if (s->flags & (1 << NFT_SET_ATTR_FLAGS)) - return &s->set_flags; - break; + return &s->set_flags; case NFT_SET_ATTR_KEY_TYPE: - if (s->flags & (1 << NFT_SET_ATTR_KEY_TYPE)) - return &s->key_type; - break; + return &s->key_type; case NFT_SET_ATTR_KEY_LEN: - if (s->flags & (1 << NFT_SET_ATTR_KEY_LEN)) - return &s->key_len; - break; + return &s->key_len; case NFT_SET_ATTR_DATA_TYPE: - if (s->flags & (1 << NFT_SET_ATTR_DATA_TYPE)) - return &s->data_type; - break; + return &s->data_type; case NFT_SET_ATTR_DATA_LEN: - if (s->flags & (1 << NFT_SET_ATTR_DATA_LEN)) - return &s->data_len; - break; + return &s->data_len; case NFT_SET_ATTR_FAMILY: - if (s->flags & (1 << NFT_SET_ATTR_FAMILY)) - return &s->family; - break; - default: - break; + return &s->family; } return NULL; } |