tags: Re-implement tags iterator to avoid having C++ in the interface

We want to be able to iterate over tags stored in various ways, so
the previous TermIterator-based tags object just wasn't general
enough. The new interface is nice and simple, and involves only
C datatypes.

1 files changed, 4 insertions, 4 deletions

diff --git a/notmuch.c b/notmuch.c
index e2347524..cc53d1d6 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -924,11 +924,11 @@ main (int argc, char *argv[])
 	strcmp (argv[1], "--help") == 0)
     {
 	fprintf (stderr, "The notmuch mail system.\n\n");
+	usage ();
+	return 0;
     } else {
 	fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
+	usage ();
+	return 1;
     }
-    usage ();
-    exit (1);
-
-    return 0;
 }