Make view->regex into a pointer

diff --git a/tig.c b/tig.c
index bcff66f5caa73da750367e27f307b0e08d605fe7..0acb1b0cd33c306d4dd0f4767b97a9bbc5f116a7 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -1192,7 +1192,7 @@ struct view {
 
        /* Searching */
        char grep[SIZEOF_STR];  /* Search string */
 
        /* Searching */
        char grep[SIZEOF_STR];  /* Search string */

-       regex_t regex;          /* Pre-compiled regex */
+       regex_t *regex;         /* Pre-compiled regex */

 
        /* If non-NULL, points to the view that opened this view. If this view
         * is closed tig will switch back to the parent view. */
 
        /* If non-NULL, points to the view that opened this view. If this view
         * is closed tig will switch back to the parent view. */


@@ -1680,16 +1680,20 @@ search_view(struct view *view, enum request request, const char *search)
 {
        int regex_err;
 
 {
        int regex_err;
 

-       if (*view->grep) {
-               regfree(&view->regex);
+       if (view->regex) {
+               regfree(view->regex);

                *view->grep = 0;
                *view->grep = 0;

+       } else {
+               view->regex = calloc(1, sizeof(*view->regex));
+               if (!view->regex)
+                       return;

        }
 
        }
 

-       regex_err = regcomp(&view->regex, search, REG_EXTENDED);
+       regex_err = regcomp(view->regex, search, REG_EXTENDED);

        if (regex_err != 0) {
                char buf[SIZEOF_STR] = "unknown error";
 
        if (regex_err != 0) {
                char buf[SIZEOF_STR] = "unknown error";
 

-               regerror(regex_err, &view->regex, buf, sizeof(buf));
+               regerror(regex_err, view->regex, buf, sizeof(buf));

                report("Search failed: %s", buf);
                return;
        }
                report("Search failed: %s", buf);
                return;
        }


@@ -2408,7 +2412,7 @@ pager_grep(struct view *view, struct line *line)
        if (!*text)
                return FALSE;
 
        if (!*text)
                return FALSE;
 

-       if (regexec(&view->regex, text, 1, &pmatch, 0) == REG_NOMATCH)
+       if (regexec(view->regex, text, 1, &pmatch, 0) == REG_NOMATCH)

                return FALSE;
 
        return TRUE;
                return FALSE;
 
        return TRUE;


@@ -2884,7 +2888,7 @@ main_grep(struct view *view, struct line *line)
                        return FALSE;
                }
 
                        return FALSE;
                }
 

-               if (regexec(&view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+               if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)

                        return TRUE;
        }
 
                        return TRUE;
        }