Simplify the API when we cannot fail

thomasjfox · Dec 12, 2018 · e3d4cff · e3d4cff
1 parent 408c86b
commit e3d4cff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/init.c b/init.c
@@ -1117,8 +1117,7 @@ static int parse_group(struct Buffer *buf, struct Buffer *s, unsigned long data,
 
     if (data == MUTT_UNGROUP && (mutt_str_strcasecmp(buf->data, "*") == 0))
     {
-      if (mutt_group_context_clear(&gc) < 0)
-        goto bail;
+      mutt_group_context_clear(&gc);
       goto out;
     }
 

diff --git a/mutt/group.c b/mutt/group.c
@@ -95,9 +95,8 @@ static void group_remove(struct Group *g)
 /**
  * mutt_group_context_clear - Clear a GroupList
  * @param head GroupList to clear
- * @retval 0 Always
  */
-int mutt_group_context_clear(struct GroupList *head)
+void mutt_group_context_clear(struct GroupList *head)
 {
   struct GroupNode *np = STAILQ_FIRST(head), *next = NULL;
   while (np)
@@ -108,7 +107,6 @@ int mutt_group_context_clear(struct GroupList *head)
     np = next;
   }
   STAILQ_INIT(head);
-  return 0;
 }
 
 /**

diff --git a/mutt/group.h b/mutt/group.h
@@ -64,7 +64,7 @@ int mutt_group_context_add_regex(struct GroupList *head, const char *s,
 
 bool mutt_group_match(struct Group *g, const char *s);
 
-int mutt_group_context_clear(struct GroupList *head);
+void mutt_group_context_clear(struct GroupList *head);
 int mutt_group_context_remove_regex(struct GroupList *head, const char *s);
 int mutt_group_context_remove_addrlist(struct GroupList *head, struct Address *a);