message_file_get_header: Use break where more clear than continue.

[notmuch] / lib / message-file.c

diff --git a/lib/message-file.c b/lib/message-file.c
index 75caba6d8b055e5c3b57b2d72d1926381ff11fc8..3a1a681de5299eeca679800c8e045b83d6507b0d 100644 (file)
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -238,7 +238,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
        return decoded_value;
 
     if (message->parsing_finished)
-       return NULL;
+       return "";
 
 #define NEXT_HEADER_LINE(closure)                              \
     while (1) {                                                        \
@@ -282,7 +282,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
                message->good_headers < 5)
            {
                message->parsing_finished = 1;
-               continue;
+               break;
            }
            NEXT_HEADER_LINE (NULL);
            continue;
@@ -325,6 +325,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
            return decoded_value;
     }
 
+    if (message->parsing_finished) {
+        fclose (message->file);
+        message->file = NULL;
+    }
+
     if (message->line)
        free (message->line);
     message->line = NULL;
@@ -348,5 +353,5 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
                        header_desired);
     }
 
-    return NULL;
+    return "";
 }