[PATCH 1/2] Remove unneeded NONULL check for subtype in mutt_edit_content_type().

[Kevin J. McCarthy]

The prompt checks for an empty response, and the call to
mutt_parse_content_type() does not allow for a NULL b->subtype after
it returns.  So remove the unneeded NONULL wrappers around b->subtype
just below.
---
 commands.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands.c b/commands.c
index 0addbdde..94d26433 100644
--- a/commands.c
+++ b/commands.c
@@ -1128,7 +1128,7 @@ int mutt_edit_content_type(HEADER *h, BODY *b, FILE *fp)
   mutt_parse_content_type(buf, b);
 
 
-  snprintf(tmp, sizeof(tmp), "%s/%s", TYPE(b), NONULL(b->subtype));
+  snprintf(tmp, sizeof(tmp), "%s/%s", TYPE(b), b->subtype);
   type_changed = ascii_strcasecmp(tmp, obuf);
   charset_changed = ascii_strcasecmp(charset, mutt_get_parameter("charset", 
b->parameter));
 
@@ -1145,7 +1145,7 @@ int mutt_edit_content_type(HEADER *h, BODY *b, FILE *fp)
 
   /* inform the user */
 
-  snprintf(tmp, sizeof(tmp), "%s/%s", TYPE(b), NONULL(b->subtype));
+  snprintf(tmp, sizeof(tmp), "%s/%s", TYPE(b), b->subtype);
   if (type_changed)
     mutt_message(_("Content-Type changed to %s."), tmp);
   if (b->type == TYPETEXT && charset_changed)
-- 
2.55.0