[PATCH 08/30] tree.h: format argument lists of read_tree_recursive() users
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-03-08 15:08:15
Subsystem:
the rest · Maintainer:
Linus Torvalds
In preparation for adding a new argument to read_tree_fn_t re-indent and format the argument list of read_tree_recursive() callbacks, and the relevant functions they call. This is a whitespace-only change to make reading subsequent commits easier. I'll be adding a new argument on the "mode" line, so leave space on it. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- archive.c | 13 ++++++++----- builtin/checkout.c | 4 +++- builtin/log.c | 5 +++-- builtin/ls-tree.c | 4 +++- merge-recursive.c | 3 ++- tree.h | 5 ++++- 6 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/archive.c b/archive.c
index 6669a4bd147..db69a8acadb 100644
--- a/archive.c
+++ b/archive.c@@ -138,8 +138,9 @@ static int check_attr_export_subst(const struct attr_check *check) } static int write_archive_entry(const struct object_id *oid, const char *base, - int baselen, const char *filename, unsigned mode, int stage, - void *context) + int baselen, const char *filename, + unsigned mode, + int stage, void *context) { static struct strbuf path = STRBUF_INIT; struct archiver_context *c = context;
@@ -230,8 +231,9 @@ static int write_directory(struct archiver_context *c) } static int queue_or_write_archive_entry(const struct object_id *oid, - struct strbuf *base, const char *filename, - unsigned mode, void *context) + struct strbuf *base, const char *filename, + unsigned mode, + void *context) { struct archiver_context *c = context; int stage = 0;
@@ -378,7 +380,8 @@ struct path_exists_context { }; static int reject_entry(const struct object_id *oid, struct strbuf *base, - const char *filename, unsigned mode, + const char *filename, + unsigned mode, void *context) { int ret = -1;
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2c2d58a230f..a78b54624b0 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c@@ -114,7 +114,9 @@ static int post_checkout_hook(struct commit *old_commit, struct commit *new_comm } static int update_some(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *context) + const char *pathname, + unsigned mode, + void *context) { int len; struct cache_entry *ce;
diff --git a/builtin/log.c b/builtin/log.c
index 58acb2b76ab..3766f553971 100644
--- a/builtin/log.c
+++ b/builtin/log.c@@ -598,8 +598,9 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev) } static int show_tree_object(const struct object_id *oid, - struct strbuf *base, - const char *pathname, unsigned mode, void *context) + struct strbuf *base, const char *pathname, + unsigned mode, + void *context) { FILE *file = context; fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index dbb31217beb..aaa41e66234 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c@@ -62,7 +62,9 @@ static int show_recursive(const char *base, int baselen, const char *pathname) } static int show_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *context) + const char *pathname, + unsigned mode, + void *context) { int retval = 0; int baselen;
diff --git a/merge-recursive.c b/merge-recursive.c
index 0baa6b5ca56..aa12543ecc9 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -453,7 +453,8 @@ static void unpack_trees_finish(struct merge_options *opt) static int save_files_dirs(const struct object_id *oid, struct strbuf *base, const char *path, - unsigned int mode, void *context) + unsigned int mode, + void *context) { struct path_hashmap_entry *entry; int baselen = base->len;
diff --git a/tree.h b/tree.h
index 1309ab997e5..a7030e52679 100644
--- a/tree.h
+++ b/tree.h@@ -31,7 +31,10 @@ struct tree *parse_tree_indirect(const struct object_id *oid); int cmp_cache_name_compare(const void *a_, const void *b_); #define READ_TREE_RECURSIVE 1 -typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, void *); +typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, + const char *, + unsigned int, + void *); int read_tree_recursive(struct repository *r, struct tree *tree,
--
2.31.0.rc0.126.g04f22c5b82