bash-completion: Localize variables, use more consistent variable names

[notmuch] / show-message.c

diff --git a/show-message.c b/show-message.c
index 2d3189e33474b02e2e177827f4ab17b3459d24b3..38f5897aac75ca6cf6673e982d5fab41d90ea70d 100644 (file)
--- a/show-message.c
+++ b/show-message.c
@@ -38,7 +38,7 @@ show_message_part (GMimeObject *part, int *part_count,
                if (i == 1)
                    continue;
                if (i > 1)
-                   fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
+                   fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Continuing.\n");
            }
            show_message_part (g_mime_multipart_get_part (multipart, i),
                               part_count, show_part);
@@ -74,15 +74,9 @@ show_message_body (const char *filename,
     GMimeParser *parser = NULL;
     GMimeMessage *mime_message = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-    static int initialized = 0;
     FILE *file = NULL;
     int part_count = 0;
 
-    if (! initialized) {
-       g_mime_init (0);
-       initialized = 1;
-    }
-
     file = fopen (filename, "r");
     if (! file) {
        fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));