Commit b3665f435b3ce062ff932a73056529e5b4afbc4a
2018-08-04T14:55:34
rename tog's open_view to view_open
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/tog/tog.c b/tog/tog.c
index bee3431..bd04909 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -122,7 +122,7 @@ close_view(struct tog_view *view)
}
static struct tog_view *
-open_view(int nlines, int ncols, int begin_y, int begin_x,
+view_open(int nlines, int ncols, int begin_y, int begin_x,
struct tog_view *parent, enum tog_view_type type)
{
struct tog_view *view = malloc(sizeof(*view));
@@ -760,7 +760,7 @@ show_commit(struct tog_view *parent_view, struct commit_queue_entry *entry,
goto done;
}
- view = open_view(0, 0, 0, 0, parent_view, TOG_VIEW_DIFF);
+ view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_DIFF);
if (view == NULL) {
err = got_error_from_errno();
goto done;
@@ -789,7 +789,7 @@ browse_commit(struct tog_view *parent_view, struct commit_queue_entry *entry,
if (err)
return err;
- view = open_view(0, 0, 0, 0, parent_view, TOG_VIEW_TREE);
+ view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_TREE);
if (view == NULL) {
err = got_error_from_errno();
goto done;
@@ -1038,7 +1038,7 @@ cmd_log(int argc, char *argv[])
if (error != NULL)
goto done;
- view = open_view(0, 0, 0, 0, NULL, TOG_VIEW_LOG);
+ view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_LOG);
if (view == NULL) {
error = got_error_from_errno();
goto done;
@@ -1273,7 +1273,7 @@ cmd_diff(int argc, char *argv[])
if (error)
goto done;
- view = open_view(0, 0, 0, 0, NULL, TOG_VIEW_DIFF);
+ view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_DIFF);
if (view == NULL) {
error = got_error_from_errno();
goto done;
@@ -1876,7 +1876,7 @@ show_blame_view(struct tog_view *view, const char *path,
break;
if (pobj == NULL && obj == NULL)
break;
- diff_view = open_view(0, 0, 0, 0, view,
+ diff_view = view_open(0, 0, 0, 0, view,
TOG_VIEW_DIFF);
if (diff_view == NULL) {
err = got_error_from_errno();
@@ -2022,7 +2022,7 @@ cmd_blame(int argc, char *argv[])
if (error != NULL)
goto done;
- view = open_view(0, 0, 0, 0, NULL, TOG_VIEW_BLAME);
+ view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_BLAME);
if (view == NULL) {
error = got_error_from_errno();
goto done;
@@ -2264,7 +2264,7 @@ blame_tree_entry(struct tog_view *parent_view, struct got_tree_entry *te,
if (err)
return err;
- view = open_view(0, 0, 0, 0, parent_view, TOG_VIEW_BLAME);
+ view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_BLAME);
if (view) {
err = show_blame_view(view, path, commit_id, repo);
close_view(view);
@@ -2355,7 +2355,7 @@ show_tree_view(struct tog_view *view, struct got_tree_object *root,
case 'l':
if (selected_entry) {
struct tog_view *log_view;
- log_view = open_view(0, 0, 0, 0, view,
+ log_view = view_open(0, 0, 0, 0, view,
TOG_VIEW_LOG);
if (log_view == NULL) {
err = got_error_from_errno();
@@ -2563,7 +2563,7 @@ cmd_tree(int argc, char *argv[])
if (error != NULL)
goto done;
- view = open_view(0, 0, 0, 0, NULL, TOG_VIEW_TREE);
+ view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_TREE);
if (view == NULL) {
error = got_error_from_errno();
goto done;