X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage.cc;h=721c9a675a426c794999938ea62f1c009cb08ab3;hp=01950505900f8d161701883b5b7a5e7dc5e67d26;hb=07378d0d1485c7cc0b126965dacd4714ebfdaa93;hpb=9439b217c349478b3603d5368f534acb1cd23974

diff --git a/lib/message.cc b/lib/message.cc
index 01950505..721c9a67 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -427,7 +427,7 @@ notmuch_message_get_filename (notmuch_message_t *message)
     const char *prefix = _find_prefix ("file-direntry");
     int prefix_len = strlen (prefix);
     Xapian::TermIterator i;
-    char *direntry, *colon;
+    char *colon, *direntry = NULL;
     const char *db_path, *directory, *basename;
     unsigned int directory_id;
     void *local = talloc_new (message);
@@ -739,8 +739,8 @@ notmuch_message_remove_all_tags (notmuch_message_t *message)
 	return status;
 
     for (tags = notmuch_message_get_tags (message);
-	 notmuch_tags_has_more (tags);
-	 notmuch_tags_advance (tags))
+	 notmuch_tags_valid (tags);
+	 notmuch_tags_move_to_next (tags))
     {
 	tag = notmuch_tags_get (tags);