From 99b6908162b73143e0fb4d0babca80dbea48e304 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sun, 26 Apr 2020 20:14:15 -0400
Subject: Rename part->id to part->contentID

Disambiguate with messageID.
---
 archive.h | 2 +-
 html.c    | 4 ++--
 parse.c   | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/archive.h b/archive.h
index 8cb20fe..324f342 100644
--- a/archive.h
+++ b/archive.h
@@ -79,7 +79,7 @@ struct BodyPart {
 	};
 	const char *subtype;
 	struct List params;
-	const char *id;
+	const char *contentID;
 	const char *description;
 	const char *encoding;
 	uint32_t size;
diff --git a/html.c b/html.c
index a8c344e..ff08357 100644
--- a/html.c
+++ b/html.c
@@ -175,10 +175,10 @@ int htmlMessageOpen(FILE *file, const struct Envelope *envelope) {
 
 static int htmlInlineAttrs(FILE *file, const struct BodyPart *part) {
 	const char *template = " [attr]=\"[value]\"";
-	if (part->id) {
+	if (part->contentID) {
 		struct Variable vars[] = {
 			{ "attr", "id" },
-			{ "value", part->id },
+			{ "value", part->contentID },
 			{0},
 		};
 		int error = templateRender(file, template, vars, escapeXML);
diff --git a/parse.c b/parse.c
index e2f2a99..ead3b15 100644
--- a/parse.c
+++ b/parse.c
@@ -122,7 +122,9 @@ static void parseDisposition(struct BodyPart *part, struct List list) {
 }
 
 static void parseNonMultipart(struct BodyPart *part, struct List list) {
-	enum { Type, Subtype, Params, ID, Description, Encoding, Size, BasicLen };
+	enum {
+		Type, Subtype, Params, ContentID, Description, Encoding, Size, BasicLen
+	};
 	if (list.len < BasicLen) errx(EX_PROTOCOL, "missing body part fields");
 
 	part->multipart = false;
@@ -131,8 +133,8 @@ static void parseNonMultipart(struct BodyPart *part, struct List list) {
 	if (list.ptr[Params].type == List) {
 		part->params = list.ptr[Params].list;
 	}
-	if (list.ptr[ID].type == String) {
-		part->id = list.ptr[ID].string;
+	if (list.ptr[ContentID].type == String) {
+		part->contentID = list.ptr[ContentID].string;
 	}
 	if (list.ptr[Description].type == String) {
 		part->description = list.ptr[Description].string;
-- 
cgit 1.4.1