[SECNET PATCH 11/14] site: named_for_us: Reorganise into "if"s

[Ian Jackson]

This gives us somewhere to put our whynot updates.

No functional change.

Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
---
 site.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/site.c b/site.c
index 16bceaf..4df131f 100644
--- a/site.c
+++ b/site.c
@@ -1777,14 +1777,18 @@ static bool_t named_for_us(struct site *st, const struct buffer_if *buf_in,
     struct buffer_if buf[1];
     buffer_readonly_clone(buf,buf_in);
 
-#define NAME_MATCHES(lr) \
-    name_matches(&m->lr, st->lr##name)
-
-    return unpick_msg(st,type,buf,m)
-	&& NAME_MATCHES(remote)
-	&& NAME_MATCHES(local );
-
+    if (!unpick_msg(st,type,buf,m)) {
+	return False;
+    }
+#define NAME_MATCHES(lr)			\
+    if (!name_matches(&m->lr, st->lr##name)) {	\
+        return False;				\
+    }
+    NAME_MATCHES(remote);
+    NAME_MATCHES(local );
 #undef NAME_MATCHES
+
+    return True;
 }
 
 static bool_t we_have_priority(struct site *st, const struct msg *m) {
-- 
2.11.0