From: Richard Russon <rich@flatcap.org>
Date: Fri, 18 Jan 2019 02:09:51 +0000 (+0000)
Subject: standardise naming in Pattern
X-Git-Tag: 2019-10-25~372^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7881a91c36a13b8f7c7c70c2a0f1b1bc9ab00e6;p=neomutt

standardise naming in Pattern
---

diff --git a/pattern.c b/pattern.c
index 7eb6542e0..5ba304fdb 100644
--- a/pattern.c
+++ b/pattern.c
@@ -223,7 +223,7 @@ static bool eat_regex(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
   }
   else if (pat->groupmatch)
   {
-    pat->p.g = mutt_pattern_group(buf.data);
+    pat->p.group = mutt_pattern_group(buf.data);
     FREE(&buf.data);
   }
   else
@@ -1071,7 +1071,7 @@ static int patmatch(const struct Pattern *pat, const char *buf)
   else if (pat->stringmatch)
     return pat->ign_case ? !strcasestr(buf, pat->p.str) : !strstr(buf, pat->p.str);
   else if (pat->groupmatch)
-    return !mutt_group_match(pat->p.g, buf);
+    return !mutt_group_match(pat->p.group, buf);
   else
     return regexec(pat->p.regex, buf, 0, NULL, 0);
 }
@@ -1351,7 +1351,7 @@ void mutt_pattern_free(struct Pattern **pat)
     else if (tmp->stringmatch)
       FREE(&tmp->p.str);
     else if (tmp->groupmatch)
-      tmp->p.g = NULL;
+      tmp->p.group = NULL;
     else if (tmp->p.regex)
     {
       regfree(tmp->p.regex);
diff --git a/pattern.h b/pattern.h
index a29c898c4..fdd5e5d4d 100644
--- a/pattern.h
+++ b/pattern.h
@@ -57,7 +57,7 @@ struct Pattern
   struct Pattern *child; /**< arguments to logical op */
   union {
     regex_t *regex;
-    struct Group *g;
+    struct Group *group;
     char *str;
     struct ListHead multi_cases;
   } p;