replace 'group_context_t' with 'struct GroupContext'

diff --git a/group.c b/group.c
index 9ab40cb6714e4a040567f5114413c717d70a0389..56c444b6c94b3435c81761b22ffe7317d90c9c54 100644 (file)
--- a/group.c
+++ b/group.c
@@ -59,9 +59,9 @@ static void group_remove(struct Group *g)
   FREE(&g);
 }
 
-int mutt_group_context_clear(group_context_t **ctx)
+int mutt_group_context_clear(struct GroupContext **ctx)
 {
-  group_context_t *t = NULL;
+  struct GroupContext *t = NULL;
   for (; ctx && *ctx; (*ctx) = t)
   {
     group_remove((*ctx)->g);
@@ -78,7 +78,7 @@ static int empty_group(struct Group *g)
   return !g->as && !g->rs;
 }
 
-void mutt_group_context_add(group_context_t **ctx, struct Group *group)
+void mutt_group_context_add(struct GroupContext **ctx, struct Group *group)
 {
   for (; *ctx; ctx = &((*ctx)->next))
   {
@@ -86,13 +86,13 @@ void mutt_group_context_add(group_context_t **ctx, struct Group *group)
       return;
   }
 
-  *ctx = safe_calloc(1, sizeof(group_context_t));
+  *ctx = safe_calloc(1, sizeof(struct GroupContext));
   (*ctx)->g = group;
 }
 
-void mutt_group_context_destroy(group_context_t **ctx)
+void mutt_group_context_destroy(struct GroupContext **ctx)
 {
-  group_context_t *p = NULL;
+  struct GroupContext *p = NULL;
   for (; *ctx; *ctx = p)
   {
     p = (*ctx)->next;
@@ -142,13 +142,13 @@ static int group_remove_rx(struct Group *g, const char *s)
   return mutt_remove_from_rx_list(&g->rs, s);
 }
 
-void mutt_group_context_add_adrlist(group_context_t *ctx, struct Address *a)
+void mutt_group_context_add_adrlist(struct GroupContext *ctx, struct Address *a)
 {
   for (; ctx; ctx = ctx->next)
     group_add_adrlist(ctx->g, a);
 }
 
-int mutt_group_context_remove_adrlist(group_context_t *ctx, struct Address *a)
+int mutt_group_context_remove_adrlist(struct GroupContext *ctx, struct Address *a)
 {
   int rv = 0;
 
@@ -162,7 +162,7 @@ int mutt_group_context_remove_adrlist(group_context_t *ctx, struct Address *a)
   return rv;
 }
 
-int mutt_group_context_add_rx(group_context_t *ctx, const char *s, int flags, struct Buffer *err)
+int mutt_group_context_add_rx(struct GroupContext *ctx, const char *s, int flags, struct Buffer *err)
 {
   int rv = 0;
 
@@ -172,7 +172,7 @@ int mutt_group_context_add_rx(group_context_t *ctx, const char *s, int flags, st
   return rv;
 }
 
-int mutt_group_context_remove_rx(group_context_t *ctx, const char *s)
+int mutt_group_context_remove_rx(struct GroupContext *ctx, const char *s)
 {
   int rv = 0;
 

diff --git a/group.h b/group.h
index d528b41c37b2b82417c6176ac67c4aefc243b6b0..9ce9f494956b5ca5fe42be86f455045a86ed7dca 100644 (file)
--- a/group.h
+++ b/group.h
@@ -22,15 +22,15 @@
 #define MUTT_GROUP   0
 #define MUTT_UNGROUP 1
 
-void mutt_group_context_add(group_context_t **ctx, struct Group *group);
-void mutt_group_context_destroy(group_context_t **ctx);
-void mutt_group_context_add_adrlist(group_context_t *ctx, struct Address *a);
-int mutt_group_context_add_rx(group_context_t *ctx, const char *s, int flags, struct Buffer *err);
+void mutt_group_context_add(struct GroupContext **ctx, struct Group *group);
+void mutt_group_context_destroy(struct GroupContext **ctx);
+void mutt_group_context_add_adrlist(struct GroupContext *ctx, struct Address *a);
+int mutt_group_context_add_rx(struct GroupContext *ctx, const char *s, int flags, struct Buffer *err);
 
 bool mutt_group_match(struct Group *g, const char *s);
 
-int mutt_group_context_clear(group_context_t **ctx);
-int mutt_group_context_remove_rx(group_context_t *ctx, const char *s);
-int mutt_group_context_remove_adrlist(group_context_t *ctx, struct Address *a);
+int mutt_group_context_clear(struct GroupContext **ctx);
+int mutt_group_context_remove_rx(struct GroupContext *ctx, const char *s);
+int mutt_group_context_remove_adrlist(struct GroupContext *ctx, struct Address *a);
 
 #endif /* _MUTT_GROUP_H */

diff --git a/init.c b/init.c
index a8f90660051d4ca0dac25a9e9abb2539d92d3598..ed39b7b74dda2d53e927deba1166c64f1b80a226 100644 (file)
--- a/init.c
+++ b/init.c
@@ -932,7 +932,7 @@ static void _alternates_clean(void)
 
 static int parse_alternates(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  group_context_t *gc = NULL;
+  struct GroupContext *gc = NULL;
 
   _alternates_clean();
 
@@ -1204,7 +1204,7 @@ static int parse_path_unlist(struct Buffer *buf, struct Buffer *s, unsigned long
 
 static int parse_lists(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  group_context_t *gc = NULL;
+  struct GroupContext *gc = NULL;
 
   do
   {
@@ -1234,7 +1234,7 @@ typedef enum group_state_t { NONE, RX, ADDR } group_state_t;
 
 static int parse_group(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  group_context_t *gc = NULL;
+  struct GroupContext *gc = NULL;
   group_state_t state = NONE;
   struct Address *addr = NULL;
   char *estr = NULL;
@@ -1601,7 +1601,7 @@ static int parse_unlists(struct Buffer *buf, struct Buffer *s, unsigned long dat
 
 static int parse_subscribe(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  group_context_t *gc = NULL;
+  struct GroupContext *gc = NULL;
 
   do
   {
@@ -1695,7 +1695,7 @@ static int parse_alias(struct Buffer *buf, struct Buffer *s, unsigned long data,
   struct Alias *tmp = Aliases;
   struct Alias *last = NULL;
   char *estr = NULL;
-  group_context_t *gc = NULL;
+  struct GroupContext *gc = NULL;
 
   if (!MoreArgs(s))
   {
@@ -4256,7 +4256,7 @@ int mutt_get_hook_type(const char *name)
   return 0;
 }
 
-static int parse_group_context(group_context_t **ctx, struct Buffer *buf, struct Buffer *s,
+static int parse_group_context(struct GroupContext **ctx, struct Buffer *buf, struct Buffer *s,
                                unsigned long data, struct Buffer *err)
 {
   while (mutt_strcasecmp(buf->data, "-group") == 0)

diff --git a/init.h b/init.h
index dea4a3b78061e31305412198896ba6e6b75a43a1..b9dde2e15acf44a5c772e174f15ba37a81d6fd81 100644 (file)
--- a/init.h
+++ b/init.h
@@ -4453,7 +4453,7 @@ static int parse_alternates(struct Buffer *, struct Buffer *, unsigned long, str
 static int parse_unalternates(struct Buffer *, struct Buffer *, unsigned long, struct Buffer *);
 
 /* Parse -group arguments */
-static int parse_group_context(group_context_t **ctx, struct Buffer *buf, struct Buffer *s,
+static int parse_group_context(struct GroupContext **ctx, struct Buffer *buf, struct Buffer *s,
                                unsigned long data, struct Buffer *err);
 
 #ifdef USE_NOTMUCH

diff --git a/mutt.h b/mutt.h
index 226e79ade46be77e1af73d936288df481f864be5..7cf7f7a3c7bc598fa5bb54b55ddf9e537d00a3bc 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -918,11 +918,11 @@ struct Group
   char *name;
 };
 
-typedef struct group_context_t
+struct GroupContext
 {
   struct Group *g;
-  struct group_context_t *next;
-} group_context_t;
+  struct GroupContext *next;
+};
 
 struct Pattern
 {