Add view_request to call the view request method

[tig.git] / tig.c

diff --git a/tig.c b/tig.c
index 32f4b648493b2bbfb4aacf16de78ff0240f22e08..f9d23ab53026e12236854ab0c168ebb783b6f91b 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -678,6 +678,15 @@ argv_from_env(const char **argv, const char *name)
        return !env || argv_from_string(argv, &argc, env);
 }
 
+static void
+argv_free(const char *argv[])
+{
+       int argc;
+
+       for (argc = 0; argv[argc]; argc++)
+               free((void *) argv[argc]);
+}
+
 
 /*
  * Executing external commands.
@@ -2320,6 +2329,14 @@ static struct view views[] = {
 #define view_is_displayed(view) \
        (view == display[0] || view == display[1])
 
+static enum request
+view_request(struct view *view, enum request request)
+{
+       if (!view || !view->lines)
+               return request;
+       return view->ops->request(view, request, &view->line[view->lineno]);
+}
+
 
 /*
  * View drawing.
@@ -3142,15 +3159,6 @@ reset_view(struct view *view)
        view->update_secs = 0;
 }
 
-static void
-free_argv(const char *argv[])
-{
-       int argc;
-
-       for (argc = 0; argv[argc]; argc++)
-               free((void *) argv[argc]);
-}
-
 static const char *
 format_arg(const char *name)
 {
@@ -3187,7 +3195,7 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
        int argc;
        bool noreplace = flags == FORMAT_NONE;
 
-       free_argv(dst_argv);
+       argv_free(dst_argv);
 
        for (argc = 0; src_argv[argc]; argc++) {
                const char *arg = src_argv[argc];
@@ -3597,7 +3605,7 @@ open_run_request(enum request request)
 
        if (format_argv(argv, req->argv, FORMAT_ALL))
                open_external_viewer(argv, NULL);
-       free_argv(argv);
+       argv_free(argv);
 }
 
 /*
@@ -3621,11 +3629,9 @@ view_driver(struct view *view, enum request request)
                        return TRUE;
        }
 
-       if (view && view->lines) {
-               request = view->ops->request(view, request, &view->line[view->lineno]);
-               if (request == REQ_NONE)
-                       return TRUE;
-       }
+       request = view_request(view, request);
+       if (request == REQ_NONE)
+               return TRUE;
 
        switch (request) {
        case REQ_MOVE_UP:
@@ -3712,9 +3718,7 @@ view_driver(struct view *view, enum request request)
                        if (view_is_displayed(view))
                                update_view_title(view);
                        if (line != view->lineno)
-                               view->ops->request(view, REQ_ENTER,
-                                                  &view->line[view->lineno]);
-
+                               view_request(view, REQ_ENTER);
                } else {
                        move_view(view, request);
                }