"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Omar Polo <op@omarpolo.com>
Subject:
Re: Move predeclaration to correct header
To:
Josh Rickmar <jrick@zettaport.com>
Cc:
gameoftrees@openbsd.org
Date:
Mon, 03 Jul 2023 19:11:05 +0200

Download raw body.

Thread
On 2023/07/03 11:23:01 -0400, Josh Rickmar <jrick@zettaport.com> wrote:
> Spotted this while copying library code for cvg.
> 
> ok?

ok

although we can also do the opposite and make it static since it is
used only once in lib/worktree.c.

> -----------------------------------------------
> commit bc819b30aea77a97b7368fbcf801ac2c66885704 (correct-header)
> from: Josh Rickmar <jrick@zettaport.com>
> date: Mon Jul  3 15:20:46 2023 UTC
>  
>  Declare got_worktree_get_base_ref_name in include/got_worktree.h
>  
>  This function is public API (non-static and prefixed with
>  got_worktree_) so declare it in the correct header for public API use.
>  
> diff a6c2ea42da6e1783b7d7d50693d18a4c778cde18 bc819b30aea77a97b7368fbcf801ac2c66885704
> commit - a6c2ea42da6e1783b7d7d50693d18a4c778cde18
> commit + bc819b30aea77a97b7368fbcf801ac2c66885704
> blob - 5b0b7259e6ff5fc0edf8711ac6780dd49315fe54
> blob + 7cae9e428707d4c8f934bf7326c6f0b8f915afdc
> --- include/got_worktree.h
> +++ include/got_worktree.h
> @@ -107,6 +107,12 @@ const char *got_worktree_get_head_ref_name(struct got_
>  const char *got_worktree_get_head_ref_name(struct got_worktree *);
>  
>  /*
> + * Get the name of a work tree's base reference.
> + */
> +const struct got_error *got_worktree_get_base_ref_name(char **,
> +    struct got_worktree *worktree);
> +
> +/*
>   * Set the branch head reference of the work tree.
>   */
>  const struct got_error *got_worktree_set_head_ref(struct got_worktree *,
> blob - a35884552cf66d678f0db623e1dd92d976a7014e
> blob + fefcc854456ad7fdcd7841dda7f3095162a212e6
> --- lib/got_lib_worktree.h
> +++ lib/got_lib_worktree.h
> @@ -73,9 +73,6 @@ const struct got_error *got_worktree_get_base_ref_name
>  
>  #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"
>