From 6f1fc87b39335b4f60d2368413c6da7e732a0d97 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Fri, 10 Apr 2020 10:57:10 -0400
Subject: Rearrange Atom templating code

---
 html.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'html.c')

diff --git a/html.c b/html.c
index bc6035e..8aa872d 100644
--- a/html.c
+++ b/html.c
@@ -23,10 +23,6 @@
 
 #include "archive.h"
 
-static const char *addrName(struct Address addr) {
-	return (addr.name ? addr.name : addr.mailbox);
-}
-
 static int
 htmlAddressList(FILE *file, const char *class, struct AddressList list) {
 	if (!list.len) return 0;
@@ -41,7 +37,7 @@ htmlAddressList(FILE *file, const char *class, struct AddressList list) {
 	for (size_t i = 0; i < list.len; ++i) {
 		struct Variable vars[] = {
 			{ "class", class },
-			{ "name", addrName(list.addrs[i]) },
+			{ "name", addressName(list.addrs[i]) },
 			{0},
 		};
 		error = templateRender(
@@ -79,7 +75,7 @@ int htmlEnvelope(FILE *file, const struct Envelope *envelope) {
 		{ "fragment", fragment },
 		{ "subject", envelope->subject },
 		{ "mailto", mailto },
-		{ "from", addrName(envelope->from) },
+		{ "from", addressName(envelope->from) },
 		{ "date", date },
 		{ "utc", utc },
 		{0},
-- 
cgit 1.4.1