From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 21 Sep 2019 15:29:33 +0000 (+0100)
Subject: site: named_for_us: Reorganise into "if"s
X-Git-Tag: v0.5.0~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=3487bd4f5c67b8805aa404729e608b55a1beae48

site: named_for_us: Reorganise into "if"s

This gives us somewhere to put our whynot updates.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/site.c b/site.c
index b9ebc4b..add6039 100644
--- a/site.c
+++ b/site.c
@@ -1829,14 +1829,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) {