standardise naming in Group

diff --git a/mutt/group.c b/mutt/group.c
index 5fd3551344a568e4537b7461e0b43edf55f230c6..5cc86e706f97046b59da242e201016d32ec6819d 100644 (file)
--- a/mutt/group.c
+++ b/mutt/group.c
@@ -111,7 +111,7 @@ void mutt_grouplist_clear(struct GroupList *head)
   struct GroupNode *np = STAILQ_FIRST(head), *next = NULL;
   while (np)
   {
-    group_remove(np->g);
+    group_remove(np->group);
     next = STAILQ_NEXT(np, entries);
     FREE(&np);
     np = next;
@@ -141,11 +141,11 @@ void mutt_grouplist_add(struct GroupList *head, struct Group *group)
   struct GroupNode *np = NULL;
   STAILQ_FOREACH(np, head, entries)
   {
-    if (np->g == group)
+    if (np->group == group)
       return;
   }
   np = mutt_mem_calloc(1, sizeof(struct GroupNode));
-  np->g = group;
+  np->group = group;
   STAILQ_INSERT_TAIL(head, np, entries);
 }
 
@@ -245,7 +245,7 @@ void mutt_grouplist_add_addrlist(struct GroupList *head, struct Address *a)
   struct GroupNode *np = NULL;
   STAILQ_FOREACH(np, head, entries)
   {
-    group_add_addrlist(np->g, a);
+    group_add_addrlist(np->group, a);
   }
 }
 
@@ -263,9 +263,9 @@ int mutt_grouplist_remove_addrlist(struct GroupList *head, struct Address *a)
 
   STAILQ_FOREACH(np, head, entries)
   {
-    rc = group_remove_addrlist(np->g, a);
-    if (empty_group(np->g))
-      group_remove(np->g);
+    rc = group_remove_addrlist(np->group, a);
+    if (empty_group(np->group))
+      group_remove(np->group);
     if (rc)
       return rc;
   }
@@ -289,7 +289,7 @@ int mutt_grouplist_add_regex(struct GroupList *head, const char *s, int flags,
   struct GroupNode *np = NULL;
   STAILQ_FOREACH(np, head, entries)
   {
-    rc = group_add_regex(np->g, s, flags, err);
+    rc = group_add_regex(np->group, s, flags, err);
     if (rc)
       return rc;
   }
@@ -309,9 +309,9 @@ int mutt_grouplist_remove_regex(struct GroupList *head, const char *s)
   struct GroupNode *np = NULL;
   STAILQ_FOREACH(np, head, entries)
   {
-    rc = group_remove_regex(np->g, s);
-    if (empty_group(np->g))
-      group_remove(np->g);
+    rc = group_remove_regex(np->group, s);
+    if (empty_group(np->group))
+      group_remove(np->group);
     if (rc)
       return rc;
   }

diff --git a/mutt/group.h b/mutt/group.h
index 90aea7f135e2a79d9d1e6a98a3b887f90a1cce4c..f15bf050341a181c92830b57bf5fa5e51326ef9c 100644 (file)
--- a/mutt/group.h
+++ b/mutt/group.h
@@ -50,7 +50,7 @@ struct Group
  */
 struct GroupNode
 {
-  struct Group *g;
+  struct Group *group;
   STAILQ_ENTRY(GroupNode) entries;
 };