Re-indent and re-flow the argument lists archive.c has downstream of
its read_tree_recursive() call to make subsequent commits easier to
read, as I only expect to be modifying the "stage" and "mode" lines.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
archive.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/archive.c b/archive.c
index 77d1238df9..8ff97751c2 100644
--- a/archive.c
+++ b/archive.c
@@ -198,8 +198,10 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
}
static void queue_directory(const unsigned char *sha1,
- struct strbuf *base, const char *filename,
- unsigned mode, int stage, struct archiver_context *c)
+ struct strbuf *base, const char *filename,
+ unsigned mode,
+ int stage,
+ struct archiver_context *c)
{
struct directory *d;
size_t len = st_add4(base->len, 1, strlen(filename), 1);
@@ -225,8 +227,10 @@ static int write_directory(struct archiver_context *c)
ret =
write_directory(c) ||
write_archive_entry(&d->oid, d->path, d->baselen,
- d->path + d->baselen, d->mode,
- d->stage, c) != READ_TREE_RECURSIVE;
+ d->path + d->baselen,
+ d->mode,
+ d->stage,
+ c) != READ_TREE_RECURSIVE;
free(d);
return ret ? -1 : 0;
}
@@ -260,14 +264,18 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
if (check_attr_export_ignore(check))
return 0;
queue_directory(oid->hash, base, filename,
- mode, stage, c);
+ mode,
+ stage,
+ c);
return READ_TREE_RECURSIVE;
}
if (write_directory(c))
return -1;
- return write_archive_entry(oid, base->buf, base->len, filename, mode,
- stage, context);
+ return write_archive_entry(oid, base->buf, base->len, filename,
+ mode,
+ stage,
+ context);
}
struct extra_file_info {
--
2.31.0.256.gf0ddda3145
