commit 96a765a89d83bef955b17c06325d45be86d77598 from: Stefan Sperling date: Sat Aug 04 12:56:07 2018 UTC rename tog's close_view to view_close commit - b3665f435b3ce062ff932a73056529e5b4afbc4a commit + 96a765a89d83bef955b17c06325d45be86d77598 blob - bd0490904a9f27b0c02f87572d886ca44adf8e43 blob + 90a2c0abf78b6a388653657a244bb93a40a91b2d --- tog/tog.c +++ tog/tog.c @@ -112,7 +112,7 @@ show_tree_view(struct tog_view *, struct got_tree_obje struct got_object_id *, struct got_repository *); static void -close_view(struct tog_view *view) +view_close(struct tog_view *view) { if (view->panel) del_panel(view->panel); @@ -140,12 +140,12 @@ view_open(int nlines, int ncols, int begin_y, int begi view->begin_x = begin_x; view->window = newwin(nlines, ncols, begin_y, begin_x); if (view->window == NULL) { - close_view(view); + view_close(view); return NULL; } view->panel = new_panel(view->window); if (view->panel == NULL) { - close_view(view); + view_close(view); return NULL; } @@ -767,7 +767,7 @@ show_commit(struct tog_view *parent_view, struct commi } err = show_diff_view(view, obj1, obj2, repo); - close_view(view); + view_close(view); show_view(parent_view); done: if (obj1) @@ -795,7 +795,7 @@ browse_commit(struct tog_view *parent_view, struct com goto done; } err = show_tree_view(view, tree, entry->id, repo); - close_view(view); + view_close(view); show_view(parent_view); done: got_object_tree_close(tree); @@ -1044,7 +1044,7 @@ cmd_log(int argc, char *argv[]) goto done; } error = show_log_view(view, start_id, repo, path); - close_view(view); + view_close(view); done: free(repo_path); free(cwd); @@ -1279,7 +1279,7 @@ cmd_diff(int argc, char *argv[]) goto done; } error = show_diff_view(view, obj1, obj2, repo); - close_view(view); + view_close(view); done: got_repo_close(repo); if (obj1) @@ -1883,7 +1883,7 @@ show_blame_view(struct tog_view *view, const char *pat break; } err = show_diff_view(diff_view, pobj, obj, repo); - close_view(diff_view); + view_close(diff_view); show_view(view); if (pobj) { got_object_close(pobj); @@ -2028,7 +2028,7 @@ cmd_blame(int argc, char *argv[]) goto done; } error = show_blame_view(view, in_repo_path, commit_id, repo); - close_view(view); + view_close(view); done: free(in_repo_path); free(repo_path); @@ -2267,7 +2267,7 @@ blame_tree_entry(struct tog_view *parent_view, struct 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); + view_close(view); } else err = got_error_from_errno(); @@ -2364,7 +2364,7 @@ show_tree_view(struct tog_view *view, struct got_tree_ err = log_tree_entry(log_view, selected_entry, &parents, commit_id, repo); - close_view(log_view); + view_close(log_view); show_view(view); if (err) goto done; @@ -2569,7 +2569,7 @@ cmd_tree(int argc, char *argv[]) goto done; } error = show_tree_view(view, tree, commit_id, repo); - close_view(view); + view_close(view); done: free(commit_id); if (commit)