Merge branch 'da/styles'

* da/styles:
stylefix: asterisks stick to the variable, not the type

diff --git a/builtin/clone.c b/builtin/clone.c
index dd4092b0509eb9f284118c001d8451a633f9ef7c..3927edfb6ede269929dc704cbb928a7516a8a0a7 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -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;

diff --git a/commit.c b/commit.c
index 9416d842c6e870713fb183c66a785cb887661c0a..9c4439fed61c3b26d493d0f0306b65a471da9b19 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -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;

diff --git a/commit.h b/commit.h
index 470c74569fc64bc879955362b8996c6f4d616b31..bc68ccbe691a28ed9b22fa935c78d2e9640347ea 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -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);
 

diff --git a/reflog-walk.c b/reflog-walk.c
index 9ce8b53ccc85abcf27d7aff8f86a350ef2cd36b2..0e5174b6059174d2bcdb15ab584b747205e782dd 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -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));
 }

diff --git a/reflog-walk.h b/reflog-walk.h
index 50265f51c56431025b665abf34ac29fdce3d302b..a9bd60e32d24bf61cbc2ea879b5bfd0e0e5c5c61 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -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,

diff --git a/refs.h b/refs.h
index 68c57701646f05a44dd0da95d981787653ae032d..10fc3a2634409571d38a1322b9853547d216945b 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -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

diff --git a/remote-curl.c b/remote-curl.c
index 645872a4f204a51e915eecdf951613ac09277e8b..cd626d15e59832e6fee74b2ca845a23a5fce77ee 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -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;