Merge pull request libgit2#6045 from punkymaniac/qa-fix-coding-style-pointer

ethomson · web-flow · commit 5bd49aeeeb7a · 2021-09-14T07:44:37.000-04:00
Fix coding style for pointer
diff --git a/include/git2/clone.h b/include/git2/clone.h
@@ -133,7 +133,7 @@ typedef struct git_clone_options {
 	 * The name of the branch to checkout. NULL means use the
 	 * remote's default branch.
 	 */
-	const char* checkout_branch;
+	const char *checkout_branch;
 
 	/**
 	 * A callback used to create the new repository into which to
diff --git a/include/git2/notes.h b/include/git2/notes.h
@@ -84,8 +84,8 @@ GIT_EXTERN(void) git_note_iterator_free(git_note_iterator *it);
  *         (negative value)
  */
 GIT_EXTERN(int) git_note_next(
-	git_oid* note_id,
-	git_oid* annotated_id,
+	git_oid *note_id,
+	git_oid *annotated_id,
 	git_note_iterator *it);
 
 
diff --git a/include/git2/remote.h b/include/git2/remote.h
@@ -243,7 +243,7 @@ GIT_EXTERN(const char *) git_remote_pushurl(const git_remote *remote);
  * @param url the url to set
  * @return 0 or an error value
  */
-GIT_EXTERN(int) git_remote_set_url(git_repository *repo, const char *remote, const char* url);
+GIT_EXTERN(int) git_remote_set_url(git_repository *repo, const char *remote, const char *url);
 
 /**
  * Set the remote's url for pushing in the configuration.
@@ -257,7 +257,7 @@ GIT_EXTERN(int) git_remote_set_url(git_repository *repo, const char *remote, con
  * @param url the url to set
  * @return 0, or an error code
  */
-GIT_EXTERN(int) git_remote_set_pushurl(git_repository *repo, const char *remote, const char* url);
+GIT_EXTERN(int) git_remote_set_pushurl(git_repository *repo, const char *remote, const char *url);
 
 /**
  * Set the url for this particular url instance.  The URL in the
@@ -451,7 +451,7 @@ typedef int GIT_CALLBACK(git_push_transfer_progress_cb)(
 	unsigned int current,
 	unsigned int total,
 	size_t bytes,
-	void* payload);
+	void *payload);
 
 /**
  * Represents an update which will be performed on the remote during push
diff --git a/include/git2/repository.h b/include/git2/repository.h
@@ -797,8 +797,8 @@ GIT_EXTERN(int) git_repository_hashfile(
  * @return 0 on success, or an error code
  */
 GIT_EXTERN(int) git_repository_set_head(
-	git_repository* repo,
-	const char* refname);
+	git_repository *repo,
+	const char *refname);
 
 /**
  * Make the repository HEAD directly point to the Commit.
@@ -817,8 +817,8 @@ GIT_EXTERN(int) git_repository_set_head(
  * @return 0 on success, or an error code
  */
 GIT_EXTERN(int) git_repository_set_head_detached(
-	git_repository* repo,
-	const git_oid* commitish);
+	git_repository *repo,
+	const git_oid *commitish);
 
 /**
  * Make the repository HEAD directly point to the Commit.
@@ -854,7 +854,7 @@ GIT_EXTERN(int) git_repository_set_head_detached_from_annotated(
  * branch or an error code
  */
 GIT_EXTERN(int) git_repository_detach_head(
-	git_repository* repo);
+	git_repository *repo);
 
 /**
  * Repository state
diff --git a/include/git2/stash.h b/include/git2/stash.h
@@ -200,7 +200,7 @@ GIT_EXTERN(int) git_stash_apply(
  */
 typedef int GIT_CALLBACK(git_stash_cb)(
 	size_t index,
-	const char* message,
+	const char *message,
 	const git_oid *stash_id,
 	void *payload);
 
diff --git a/src/blame.c b/src/blame.c
@@ -59,7 +59,7 @@ static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line)
 	return line <= hunk->final_start_line_number;
 }
 
-static git_blame_hunk* new_hunk(
+static git_blame_hunk *new_hunk(
 		size_t start,
 		size_t lines,
 		size_t orig_start,
@@ -84,7 +84,7 @@ static void free_hunk(git_blame_hunk *hunk)
 	git__free(hunk);
 }
 
-static git_blame_hunk* dup_hunk(git_blame_hunk *hunk)
+static git_blame_hunk *dup_hunk(git_blame_hunk *hunk)
 {
 	git_blame_hunk *newhunk = new_hunk(
 			hunk->final_start_line_number,
@@ -122,7 +122,7 @@ static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by)
 	}
 }
 
-git_blame* git_blame__alloc(
+git_blame *git_blame__alloc(
 	git_repository *repo,
 	git_blame_options opts,
 	const char *path)
@@ -299,7 +299,7 @@ static int index_blob_lines(git_blame *blame)
     return blame->num_lines;
 }
 
-static git_blame_hunk* hunk_from_entry(git_blame__entry *e, git_blame *blame)
+static git_blame_hunk *hunk_from_entry(git_blame__entry *e, git_blame *blame)
 {
 	git_blame_hunk *h = new_hunk(
 			e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path);
diff --git a/src/blame_git.c b/src/blame_git.c
@@ -429,7 +429,7 @@ static int paths_on_dup(void **old, void *new)
 	return -1;
 }
 
-static git_blame__origin* find_origin(
+static git_blame__origin *find_origin(
 		git_blame *blame,
 		git_commit *parent,
 		git_blame__origin *origin)
diff --git a/src/buffer.c b/src/buffer.c
@@ -670,7 +670,7 @@ int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...)
 
 	va_start(ap, nbuf);
 	for (i = 0; i < nbuf; ++i) {
-		const char* segment;
+		const char *segment;
 		size_t segment_len;
 
 		segment = va_arg(ap, const char *);
@@ -702,7 +702,7 @@ int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...)
 
 	va_start(ap, nbuf);
 	for (i = 0; i < nbuf; ++i) {
-		const char* segment;
+		const char *segment;
 		size_t segment_len;
 
 		segment = va_arg(ap, const char *);
diff --git a/src/clone.c b/src/clone.c
@@ -265,7 +265,7 @@ static int update_head_to_branch(
 {
 	int retcode;
 	git_buf remote_branch_name = GIT_BUF_INIT;
-	git_reference* remote_ref = NULL;
+	git_reference *remote_ref = NULL;
 	git_buf default_branch = GIT_BUF_INIT;
 
 	GIT_ASSERT_ARG(remote);
diff --git a/src/commit_graph.c b/src/commit_graph.c
@@ -728,7 +728,7 @@ int git_commit_graph_writer_add_revwalk(git_commit_graph_writer *w, git_revwalk
 	git_oid id;
 	git_repository *repo = git_revwalk_repository(walk);
 	git_commit *commit;
-	struct packed_commit* packed_commit;
+	struct packed_commit *packed_commit;
 
 	while ((git_revwalk_next(&id, walk)) == 0) {
 		error = git_commit_lookup(&commit, repo, &id);
diff --git a/src/config.c b/src/config.c
@@ -511,7 +511,7 @@ int git_config_backend_foreach_match(
 	void *payload)
 {
 	git_config_entry *entry;
-	git_config_iterator* iter;
+	git_config_iterator *iter;
 	git_regexp regex;
 	int error = 0;
 
diff --git a/src/config_file.c b/src/config_file.c
@@ -164,7 +164,7 @@ static int config_file_is_modified(int *modified, config_file *file)
 	return error;
 }
 
-static void config_file_clear_includes(config_file_backend* cfg)
+static void config_file_clear_includes(config_file_backend *cfg)
 {
 	config_file *include;
 	uint32_t i;
@@ -1104,7 +1104,7 @@ static int write_on_eof(
 /*
  * This is pretty much the parsing, except we write out anything we don't have
  */
-static int config_file_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char* value)
+static int config_file_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char *value)
 
 {
 	char *orig_section = NULL, *section = NULL, *orig_name, *name, *ldot;
diff --git a/src/describe.c b/src/describe.c
@@ -391,7 +391,7 @@ static int show_suffix(
 	git_buf *buf,
 	int depth,
 	git_repository *repo,
-	const git_oid* id,
+	const git_oid *id,
 	unsigned int abbrev_size)
 {
 	int error, size = 0;
diff --git a/src/hash/sha1/sha1dc/sha1.c b/src/hash/sha1/sha1dc/sha1.c
@@ -1710,7 +1710,7 @@ static void sha1_recompression_step(uint32_t step, uint32_t ihvin[5], uint32_t i
 
 
 
-static void sha1_process(SHA1_CTX* ctx, const uint32_t block[16])
+static void sha1_process(SHA1_CTX *ctx, const uint32_t block[16])
 {
 	unsigned i, j;
 	uint32_t ubc_dv_mask[DVMASKSIZE] = { 0xFFFFFFFF };
@@ -1762,7 +1762,7 @@ static void sha1_process(SHA1_CTX* ctx, const uint32_t block[16])
 	}
 }
 
-void SHA1DCInit(SHA1_CTX* ctx)
+void SHA1DCInit(SHA1_CTX *ctx)
 {
 	ctx->total = 0;
 	ctx->ihv[0] = 0x67452301;
@@ -1778,7 +1778,7 @@ void SHA1DCInit(SHA1_CTX* ctx)
 	ctx->callback = NULL;
 }
 
-void SHA1DCSetSafeHash(SHA1_CTX* ctx, int safehash)
+void SHA1DCSetSafeHash(SHA1_CTX *ctx, int safehash)
 {
 	if (safehash)
 		ctx->safe_hash = 1;
@@ -1787,36 +1787,36 @@ void SHA1DCSetSafeHash(SHA1_CTX* ctx, int safehash)
 }
 
 
-void SHA1DCSetUseUBC(SHA1_CTX* ctx, int ubc_check)
+void SHA1DCSetUseUBC(SHA1_CTX *ctx, int ubc_check)
 {
 	if (ubc_check)
 		ctx->ubc_check = 1;
 	else
 		ctx->ubc_check = 0;
 }
 
-void SHA1DCSetUseDetectColl(SHA1_CTX* ctx, int detect_coll)
+void SHA1DCSetUseDetectColl(SHA1_CTX *ctx, int detect_coll)
 {
 	if (detect_coll)
 		ctx->detect_coll = 1;
 	else
 		ctx->detect_coll = 0;
 }
 
-void SHA1DCSetDetectReducedRoundCollision(SHA1_CTX* ctx, int reduced_round_coll)
+void SHA1DCSetDetectReducedRoundCollision(SHA1_CTX *ctx, int reduced_round_coll)
 {
 	if (reduced_round_coll)
 		ctx->reduced_round_coll = 1;
 	else
 		ctx->reduced_round_coll = 0;
 }
 
-void SHA1DCSetCallback(SHA1_CTX* ctx, collision_block_callback callback)
+void SHA1DCSetCallback(SHA1_CTX *ctx, collision_block_callback callback)
 {
 	ctx->callback = callback;
 }
 
-void SHA1DCUpdate(SHA1_CTX* ctx, const char* buf, size_t len)
+void SHA1DCUpdate(SHA1_CTX *ctx, const char *buf, size_t len)
 {
 	unsigned left, fill;
 
diff --git a/src/merge.c b/src/merge.c
@@ -1151,7 +1151,7 @@ static void deletes_by_oid_free(git_oidmap *map) {
 	git_oidmap_free(map);
 }
 
-static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid *id, size_t idx)
+static int deletes_by_oid_enqueue(git_oidmap *map, git_pool *pool, const git_oid *id, size_t idx)
 {
 	deletes_by_oid_queue *queue;
 	size_t *array_entry;
diff --git a/src/notes.c b/src/notes.c
@@ -674,7 +674,7 @@ void git_note_free(git_note *note)
 }
 
 static int process_entry_path(
-	const char* entry_path,
+	const char *entry_path,
 	git_oid *annotated_object_id)
 {
 	int error = 0;
@@ -796,8 +796,8 @@ int git_note_iterator_new(
 }
 
 int git_note_next(
-	git_oid* note_id,
-	git_oid* annotated_id,
+	git_oid *note_id,
+	git_oid *annotated_id,
 	git_note_iterator *it)
 {
 	int error;
diff --git a/src/path.c b/src/path.c
@@ -413,7 +413,7 @@ int git_path_to_dir(git_buf *path)
 	return git_buf_oom(path) ? -1 : 0;
 }
 
-void git_path_string_to_dir(char* path, size_t size)
+void git_path_string_to_dir(char *path, size_t size)
 {
 	size_t end = strlen(path);
 
diff --git a/src/path.h b/src/path.h
@@ -85,7 +85,7 @@ extern int git_path_to_dir(git_buf *path);
 /**
  * Ensure string has a trailing '/' if there is space for it.
  */
-extern void git_path_string_to_dir(char* path, size_t size);
+extern void git_path_string_to_dir(char *path, size_t size);
 
 /**
  * Taken from git.git; returns nonzero if the given path is "." or "..".
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
@@ -764,7 +764,7 @@ static bool ref_is_available(
 static int reference_path_available(
 	refdb_fs_backend *backend,
 	const char *new_ref,
-	const char* old_ref,
+	const char *old_ref,
 	int force)
 {
 	size_t i;
diff --git a/src/refs.c b/src/refs.c
@@ -249,7 +249,7 @@ int git_reference_dwim(git_reference **out, git_repository *repo, const char *re
 	git_reference *ref;
 	git_buf refnamebuf = GIT_BUF_INIT, name = GIT_BUF_INIT;
 
-	static const char* formatters[] = {
+	static const char *formatters[] = {
 		"%s",
 		GIT_REFS_DIR "%s",
 		GIT_REFS_TAGS_DIR "%s",
@@ -1246,7 +1246,7 @@ int git_reference_is_note(const git_reference *ref)
 	return git_reference__is_note(ref->name);
 }
 
-static int peel_error(int error, const git_reference *ref, const char* msg)
+static int peel_error(int error, const git_reference *ref, const char *msg)
 {
 	git_error_set(
 		GIT_ERROR_INVALID,
diff --git a/src/refspec.c b/src/refspec.c
@@ -359,7 +359,7 @@ int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs)
 	git_remote_head key;
 	git_refspec *cur;
 
-	const char* formatters[] = {
+	const char *formatters[] = {
 		GIT_REFS_DIR "%s",
 		GIT_REFS_TAGS_DIR "%s",
 		GIT_REFS_HEADS_DIR "%s",
diff --git a/src/remote.c b/src/remote.c
@@ -677,7 +677,7 @@ int git_remote_set_instance_pushurl(git_remote *remote, const char *url)
 	return 0;
 }
 
-int git_remote_set_pushurl(git_repository *repo, const char *remote, const char* url)
+int git_remote_set_pushurl(git_repository *repo, const char *remote, const char *url)
 {
 	return set_url(repo, remote, CONFIG_PUSHURL_FMT, url);
 }
diff --git a/src/repository.c b/src/repository.c
@@ -2850,8 +2850,8 @@ static int detach(git_repository *repo, const git_oid *id, const char *new)
 }
 
 int git_repository_set_head(
-	git_repository* repo,
-	const char* refname)
+	git_repository *repo,
+	const char *refname)
 {
 	git_reference *ref = NULL, *current = NULL, *new_head = NULL;
 	git_buf log_message = GIT_BUF_INIT;
@@ -2900,8 +2900,8 @@ int git_repository_set_head(
 }
 
 int git_repository_set_head_detached(
-	git_repository* repo,
-	const git_oid* commitish)
+	git_repository *repo,
+	const git_oid *commitish)
 {
 	return detach(repo, commitish, NULL);
 }
@@ -2916,7 +2916,7 @@ int git_repository_set_head_detached_from_annotated(
 	return detach(repo, git_annotated_commit_id(commitish), commitish->description);
 }
 
-int git_repository_detach_head(git_repository* repo)
+int git_repository_detach_head(git_repository *repo)
 {
 	git_reference *old_head = NULL,	*new_head = NULL, *current = NULL;
 	git_object *object = NULL;
diff --git a/src/reset.c b/src/reset.c
diff --git a/src/revparse.c b/src/revparse.c
diff --git a/src/stash.c b/src/stash.c
diff --git a/src/streams/openssl_legacy.c b/src/streams/openssl_legacy.c
diff --git a/src/streams/openssl_legacy.h b/src/streams/openssl_legacy.h
diff --git a/src/trailer.c b/src/trailer.c
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
diff --git a/src/win32/findfile.c b/src/win32/findfile.c
diff --git a/src/win32/posix.h b/src/win32/posix.h
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line)`
`59`	`59`	`return line <= hunk->final_start_line_number;`
`60`	`60`	`}`
`61`	`61`
`62`		`-static git_blame_hunk* new_hunk(`
	`62`	`+static git_blame_hunk *new_hunk(`
`63`	`63`	`size_t start,`
`64`	`64`	`size_t lines,`
`65`	`65`	`size_t orig_start,`
`@@ -84,7 +84,7 @@ static void free_hunk(git_blame_hunk *hunk)`
`84`	`84`	`git__free(hunk);`
`85`	`85`	`}`
`86`	`86`
`87`		`-static git_blame_hunk* dup_hunk(git_blame_hunk *hunk)`
	`87`	`+static git_blame_hunk dup_hunk(git_blame_hunk hunk)`
`88`	`88`	`{`
`89`	`89`	`git_blame_hunk *newhunk = new_hunk(`
`90`	`90`	`hunk->final_start_line_number,`
`@@ -122,7 +122,7 @@ static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`-git_blame* git_blame__alloc(`
	`125`	`+git_blame *git_blame__alloc(`
`126`	`126`	`git_repository *repo,`
`127`	`127`	`git_blame_options opts,`
`128`	`128`	`const char *path)`
`@@ -299,7 +299,7 @@ static int index_blob_lines(git_blame *blame)`
`299`	`299`	`return blame->num_lines;`
`300`	`300`	`}`
`301`	`301`
`302`		`-static git_blame_hunk* hunk_from_entry(git_blame__entry e, git_blame blame)`
	`302`	`+static git_blame_hunk hunk_from_entry(git_blame__entry e, git_blame *blame)`
`303`	`303`	`{`
`304`	`304`	`git_blame_hunk *h = new_hunk(`
`305`	`305`	`e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path);`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ static int paths_on_dup(void *old, void new)`
`429`	`429`	`return -1;`
`430`	`430`	`}`
`431`	`431`
`432`		`-static git_blame__origin* find_origin(`
	`432`	`+static git_blame__origin *find_origin(`
`433`	`433`	`git_blame *blame,`
`434`	`434`	`git_commit *parent,`
`435`	`435`	`git_blame__origin *origin)`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ static int update_head_to_branch(`
`265`	`265`	`{`
`266`	`266`	`int retcode;`
`267`	`267`	`git_buf remote_branch_name = GIT_BUF_INIT;`
`268`		`- git_reference* remote_ref = NULL;`
	`268`	`+ git_reference *remote_ref = NULL;`
`269`	`269`	`git_buf default_branch = GIT_BUF_INIT;`
`270`	`270`
`271`	`271`	`GIT_ASSERT_ARG(remote);`