X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage.cc;h=225b7e91bbaa4db27cd016fb587dd22c6e2e6523;hp=c2da25c953a46d04e82473cd921ad581495ba4e9;hb=7278383005de3a0d61ac3471162e7ef633d45076;hpb=96d99c383785dec67443ff1b45e2d2f8437398fa

diff --git a/lib/message.cc b/lib/message.cc
index c2da25c9..225b7e91 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -50,7 +50,7 @@ struct maildir_flag_tag {
 };
 
 /* ASCII ordered table of Maildir flags and associated tags */
-struct maildir_flag_tag flag2tag[] = {
+static struct maildir_flag_tag flag2tag[] = {
     { 'D', "draft",   false},
     { 'F', "flagged", false},
     { 'P', "passed",  false},
@@ -459,7 +459,7 @@ _notmuch_message_add_filename (notmuch_message_t *message,
  * This change will not be reflected in the database until the next
  * call to _notmuch_message_sync.
  */
-notmuch_status_t
+static notmuch_status_t
 _notmuch_message_rename (notmuch_message_t *message,
 			 const char *old_filename,
 			 const char *new_filename)
@@ -1122,7 +1122,7 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
     const char *filename;
     char *filename_new;
     char *to_set, *to_clear;
-    notmuch_status_t status;
+    notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
 
     _get_maildir_flag_actions (message, &to_set, &to_clear);