From c9c7cbb67c8a3cff9241bee1e1b1902be4e0a799 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 18 Aug 2014 22:44:57 +0200 Subject: Remove a few now unneeded peer->config NULL checks --- src/peer.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/peer.h') diff --git a/src/peer.h b/src/peer.h index 75c7b6b..9638808 100644 --- a/src/peer.h +++ b/src/peer.h @@ -225,7 +225,7 @@ static inline bool fastd_peer_config_is_floating(const fastd_peer_config_t *conf /** Checks if a peer is floating (is has at least one floating remote or no remotes at all) */ static inline bool fastd_peer_is_floating(const fastd_peer_t *peer) { - return peer->config ? fastd_peer_config_is_floating(peer->config) : true; + return fastd_peer_config_is_floating(peer->config); } /** Checks if a peer is not statically configured, but added after a on-verify run */ @@ -258,10 +258,7 @@ static inline bool fastd_peer_is_established(const fastd_peer_t *peer) { /** Returns the peer's peer group */ static inline const fastd_peer_group_t * fastd_peer_get_group(const fastd_peer_t *peer) { - if (peer->config) - return peer->config->group; - else - return conf.peer_group; + return peer->config->group; } /** Signals that a valid packet was received from the peer */ -- cgit v1.2.3