From 325a92422737f16377307dbd584158d3ee8cdb51 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 20 Apr 2019 13:51:39 -0400 Subject: [PATCH] cli/show: pass the siglist directly to the sigstatus sprinter This makes it easier to reuse format_part_sigstatus_sprinter() when we have other places that we want to display a signature status. --- notmuch-show.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 07e9a5db..88699e90 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -429,13 +429,11 @@ format_signature_errors (sprinter_t *sp, GMimeSignature *signature) /* Signature status sprinter (GMime 2.6) */ static void -format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) +format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist) { /* Any changes to the JSON or S-Expression format should be * reflected in the file devel/schemata. */ - GMimeSignatureList *siglist = node->sig_list; - sp->begin_list (sp); if (!siglist) { @@ -684,7 +682,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, if (node->verify_attempted) { sp->map_key (sp, "sigstatus"); - format_part_sigstatus_sprinter (sp, node); + format_part_sigstatus_sprinter (sp, node->sig_list); } sp->map_key (sp, "content-type");