[RFC Patch 1/3] CLI/address: refactor/inline print_popular

[David Bremner <david@tethera.net>]

The goal is to make it easier to sort the current output in future commits.

There should be no functional change in this commit.
---
 notmuch-search.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/notmuch-search.c b/notmuch-search.c
index 327e1445..47eec601 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -473,10 +473,10 @@ _list_free_for_g_hash (void *ptr)
     g_list_free_full (ptr, _talloc_free_for_g_hash);
 }
 
-/* Print the most common variant of a list of unique mailboxes, and
+/* Find the most common variant of a list of unique mailboxes, and
  * conflate the counts. */
-static void
-print_popular (const search_context_t *ctx, GList *list)
+static mailbox_t *
+summarize_mailboxes (GList *list)
 {
     GList *l;
     mailbox_t *mailbox = NULL, *m;
@@ -498,7 +498,7 @@ print_popular (const search_context_t *ctx, GList *list)
     /* The original count is no longer needed, so overwrite. */
     mailbox->count = total;
 
-    print_mailbox (ctx, mailbox);
+    return mailbox;
 }
 
 static void
@@ -512,9 +512,10 @@ print_hash_value (unused (void *key), void *list, void *context)
 {
     const search_context_t *ctx = context;
 
-    if (ctx->dedup == DEDUP_ADDRESS)
-	print_popular (ctx, list);
-    else
+    if (ctx->dedup == DEDUP_ADDRESS) {
+	mailbox_t *mailbox = summarize_mailboxes (list);
+	print_mailbox (ctx, mailbox);
+    } else
 	g_list_foreach (list, print_list_value, context);
 }
 
@@ -619,9 +620,9 @@ do_search_messages (search_context_t *ctx)
     }
 
     if (ctx->addresses &&
-	(ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS))
+	(ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS)) {
 	g_hash_table_foreach (ctx->addresses, print_hash_value, ctx);
-
+    }
     notmuch_messages_destroy (messages);
 
     format->end (format);
-- 
2.34.1