commit fcfaa6d5834dc35cb5555fcc4cb1652947bfd82d from: Josh Rickmar via: Thomas Adam date: Wed Jul 05 15:54:47 2023 UTC Make got_worktree_get_base_ref_name static Nothing appears to benefit from this being non-static, and it was missing from the public API headers as well. ok stsp@ commit - a807c50bd11f3ba2b72a8d02a1714efd21c2799c commit + fcfaa6d5834dc35cb5555fcc4cb1652947bfd82d blob - a35884552cf66d678f0db623e1dd92d976a7014e blob + fefcc854456ad7fdcd7841dda7f3095162a212e6 --- lib/got_lib_worktree.h +++ lib/got_lib_worktree.h @@ -73,9 +73,6 @@ struct got_commitable { #define GOT_WORKTREE_BASE_REF_PREFIX "refs/got/worktree/base" -const struct got_error *got_worktree_get_base_ref_name(char **, - struct got_worktree *worktree); - /* Temporary branch which accumulates commits during a rebase operation. */ #define GOT_WORKTREE_REBASE_TMP_REF_PREFIX "refs/got/worktree/rebase/tmp" blob - c37442751587cf69a16efc88767683c2588a57db blob + f75af45a4472408c7b5720b7e5a577d47ea961d0 --- lib/worktree.c +++ lib/worktree.c @@ -2347,8 +2347,8 @@ got_worktree_get_logmsg_ref_name(char **refname, struc return get_ref_name(refname, worktree, prefix); } -const struct got_error * -got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree) +static const struct got_error * +get_base_ref_name(char **refname, struct got_worktree *worktree) { return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX); } @@ -2445,7 +2445,7 @@ ref_base_commit(struct got_worktree *worktree, struct struct got_reference *ref = NULL; char *refname; - err = got_worktree_get_base_ref_name(&refname, worktree); + err = get_base_ref_name(&refname, worktree); if (err) return err;