From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 17 Mar 2011 01:45:28 +0000 (-0400)
Subject: Rename prepare_io to prepare_update and make it more specialized
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=730ae86ffae42b854e023e5d91d05551d9824c6e;p=tig.git

Rename prepare_io to prepare_update and make it more specialized
---

diff --git a/tig.c b/tig.c
index 16cfaa2..c1e5270 100644
--- a/tig.c
+++ b/tig.c
@@ -2500,18 +2500,18 @@ setup_update(struct view *view, const char *vid)
 }
 
 static bool
-prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
+prepare_update(struct view *view, const char *dir, const char *argv[])
 {
+	if (view->pipe)
+		io_done(view->pipe);
 	view->dir = dir;
-	return format_argv(&view->argv, argv, replace, !view->prev);
+	return argv_copy(&view->argv, argv);
 }
 
 static bool
 start_update(struct view *view, const char **argv, const char *dir)
 {
-	if (view->pipe)
-		io_done(view->pipe);
-	return prepare_io(view, dir, argv, FALSE) &&
+	return prepare_update(view, dir, argv) &&
 	       io_run(&view->io, IO_RD, dir, view->argv);
 }
 
@@ -2528,7 +2528,8 @@ begin_update(struct view *view, const char *dir, const char **argv, enum open_fl
 		end_update(view, TRUE);
 
 	if (!refresh) {
-		if (!prepare_io(view, dir, argv, TRUE))
+		view->dir = dir;
+		if (!format_argv(&view->argv, argv, TRUE, !view->prev))
 			return FALSE;
 
 		/* Put the current ref_* value to the view title ref
@@ -2779,9 +2780,7 @@ open_argv(struct view *prev, struct view *view, const char *argv[], const char *
 {
 	enum request request = view - views + REQ_OFFSET + 1;
 
-	if (view->pipe)
-		end_update(view, TRUE);
-	if (!prepare_io(view, dir, argv, FALSE)) {
+	if (!prepare_update(view, dir, argv)) {
 		report("Failed to open %s view: %s", view->name, io_strerror(&view->io));
 	} else {
 		open_view(prev, request, flags | OPEN_PREPARED);