Consolidate and share view resetting via new reset_view()

diff --git a/tig.c b/tig.c
index 3da49f2855b25cf0546c3c284557002f1c8a685e..51cbb2043c1a41d0c0cd7c7fac09badb0d5b953e 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -2184,6 +2184,24 @@ search_view(struct view *view, enum request request)
  * Incremental updating
  */
 
+static void
+reset_view(struct view *view)
+{
+       int i;
+
+       for (i = 0; i < view->lines; i++)
+               free(view->line[i].data);
+       free(view->line);
+
+       view->line = NULL;
+       view->offset = 0;
+       view->lines  = 0;
+       view->lineno = 0;
+       view->line_size = 0;
+       view->line_alloc = 0;
+       view->vid[0] = 0;
+}
+
 static void
 end_update(struct view *view, bool force)
 {
@@ -2252,23 +2270,9 @@ begin_update(struct view *view, bool refresh)
                return FALSE;
 
        set_nonblocking_input(TRUE);
-
-       view->offset = 0;
-       view->lines  = 0;
-       view->lineno = 0;
+       reset_view(view);
        string_copy_rev(view->vid, view->id);
 
-       if (view->line) {
-               int i;
-
-               for (i = 0; i < view->lines; i++)
-                       if (view->line[i].data)
-                               free(view->line[i].data);
-
-               free(view->line);
-               view->line = NULL;
-       }
-
        view->start_time = time(NULL);
 
        return TRUE;
@@ -3518,21 +3522,10 @@ blame_open(struct view *view)
        if (!string_format(view->cmd, BLAME_INCREMENTAL_CMD, ref, path))
                return FALSE;
 
+       reset_view(view);
        string_format(view->ref, "%s ...", opt_file);
        string_copy_rev(view->vid, opt_file);
        set_nonblocking_input(TRUE);
-
-       if (view->line) {
-               int i;
-
-               for (i = 0; i < view->lines; i++)
-                       free(view->line[i].data);
-               free(view->line);
-       }
-
-       view->lines = view->line_alloc = view->line_size = view->lineno = 0;
-       view->offset = view->lines  = view->lineno = 0;
-       view->line = NULL;
        view->start_time = time(NULL);
 
        return TRUE;
@@ -4029,13 +4022,8 @@ static bool
 status_open(struct view *view)
 {
        unsigned long prev_lineno = view->lineno;
-       size_t i;
 
-       for (i = 0; i < view->lines; i++)
-               free(view->line[i].data);
-       free(view->line);
-       view->lines = view->line_alloc = view->line_size = view->lineno = 0;
-       view->line = NULL;
+       reset_view(view);
 
        if (!realloc_lines(view, view->line_size + 7))
                return FALSE;