Skip to content

Commit

Permalink
Merge branch 'da/styles'
Browse files Browse the repository at this point in the history
* da/styles:
  stylefix: asterisks stick to the variable, not the type
  • Loading branch information
Junio C Hamano committed Sep 19, 2014
2 parents 296b4c4 + 24d36f1 commit 83510ef
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,10 @@ static void write_config(struct string_list *config)
}
}

static void write_refspec_config(const char* src_ref_prefix,
const struct ref* our_head_points_at,
const struct ref* remote_head_points_at, struct strbuf* branch_top)
static void write_refspec_config(const char *src_ref_prefix,
const struct ref *our_head_points_at,
const struct ref *remote_head_points_at,
struct strbuf *branch_top)
{
struct strbuf key = STRBUF_INIT;
struct strbuf value = STRBUF_INIT;
Expand Down
2 changes: 1 addition & 1 deletion commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ static void parse_gpg_output(struct signature_check *sigc)
}
}

void check_commit_signature(const struct commit* commit, struct signature_check *sigc)
void check_commit_signature(const struct commit *commit, struct signature_check *sigc)
{
struct strbuf payload = STRBUF_INIT;
struct strbuf signature = STRBUF_INIT;
Expand Down
2 changes: 1 addition & 1 deletion commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ extern void print_commit_list(struct commit_list *list,
* at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
* sig->signer and sig->key.
*/
extern void check_commit_signature(const struct commit* commit, struct signature_check *sigc);
extern void check_commit_signature(const struct commit *commit, struct signature_check *sigc);

int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);

Expand Down
2 changes: 1 addition & 1 deletion reflog-walk.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ struct reflog_walk_info {
struct commit_reflog *last_commit_reflog;
};

void init_reflog_walk(struct reflog_walk_info** info)
void init_reflog_walk(struct reflog_walk_info **info)
{
*info = xcalloc(1, sizeof(struct reflog_walk_info));
}
Expand Down
2 changes: 1 addition & 1 deletion reflog-walk.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

struct reflog_walk_info;

extern void init_reflog_walk(struct reflog_walk_info** info);
extern void init_reflog_walk(struct reflog_walk_info **info);
extern int add_reflog_for_walk(struct reflog_walk_info *info,
struct commit *commit, const char *name);
extern void fake_reflog_parent(struct reflog_walk_info *info,
Expand Down
2 changes: 1 addition & 1 deletion refs.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static inline const char *has_glob_specials(const char *pattern)
extern int for_each_rawref(each_ref_fn, void *);

extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list* refnames);
extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames);

/*
* Lock the packed-refs file for writing. Flags is passed to
Expand Down
2 changes: 1 addition & 1 deletion remote-curl.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static int show_http_message(struct strbuf *type, struct strbuf *charset,
return 0;
}

static struct discovery* discover_refs(const char *service, int for_push)
static struct discovery *discover_refs(const char *service, int for_push)
{
struct strbuf exp = STRBUF_INIT;
struct strbuf type = STRBUF_INIT;
Expand Down

0 comments on commit 83510ef

Please sign in to comment.