Commit 34fa6311423f55827184c6338226dde4ee46d4e5
2021-08-30T17:55:13
commit graph: formatting fixes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/include/git2/sys/commit_graph.h b/include/git2/sys/commit_graph.h
index 67d9546..f6c0fc4 100644
--- a/include/git2/sys/commit_graph.h
+++ b/include/git2/sys/commit_graph.h
@@ -127,9 +127,8 @@ typedef struct {
} git_commit_graph_writer_options;
#define GIT_COMMIT_GRAPH_WRITER_OPTIONS_VERSION 1
-#define GIT_COMMIT_GRAPH_WRITER_OPTIONS_INIT \
- { \
- GIT_COMMIT_GRAPH_WRITER_OPTIONS_VERSION, \
+#define GIT_COMMIT_GRAPH_WRITER_OPTIONS_INIT { \
+ GIT_COMMIT_GRAPH_WRITER_OPTIONS_VERSION \
}
/**
diff --git a/src/commit_graph.c b/src/commit_graph.c
index 8323485..9abe373 100644
--- a/src/commit_graph.c
+++ b/src/commit_graph.c
@@ -915,8 +915,11 @@ static int write_offset(off64_t offset, commit_graph_write_cb write_cb, void *cb
return 0;
}
-static int
-write_chunk_header(int chunk_id, off64_t offset, commit_graph_write_cb write_cb, void *cb_data)
+static int write_chunk_header(
+ int chunk_id,
+ off64_t offset,
+ commit_graph_write_cb write_cb,
+ void *cb_data)
{
uint32_t word = htonl(chunk_id);
int error = write_cb((const char *)&word, sizeof(word), cb_data);
@@ -954,8 +957,10 @@ static void packed_commit_free_dup(void *packed_commit)
packed_commit_free(packed_commit);
}
-static int
-commit_graph_write(git_commit_graph_writer *w, commit_graph_write_cb write_cb, void *cb_data)
+static int commit_graph_write(
+ git_commit_graph_writer *w,
+ commit_graph_write_cb write_cb,
+ void *cb_data)
{
int error = 0;
size_t i;
@@ -996,18 +1001,17 @@ commit_graph_write(git_commit_graph_writer *w, commit_graph_write_cb write_cb, v
/* Fill the OID Fanout table. */
oid_fanout_count = 0;
for (i = 0; i < 256; i++) {
- while (oid_fanout_count < git_vector_length(&w->commits)
- && ((struct packed_commit *)git_vector_get(&w->commits, oid_fanout_count))
- ->sha1.id[0]
- <= i)
+ while (oid_fanout_count < git_vector_length(&w->commits) &&
+ (packed_commit = (struct packed_commit *)git_vector_get(&w->commits, oid_fanout_count)) &&
+ packed_commit->sha1.id[0] <= i)
++oid_fanout_count;
oid_fanout[i] = htonl(oid_fanout_count);
}
/* Fill the OID Lookup table. */
git_vector_foreach (&w->commits, i, packed_commit) {
- error = git_buf_put(
- &oid_lookup, (const char *)&packed_commit->sha1, sizeof(git_oid));
+ error = git_buf_put(&oid_lookup,
+ (const char *)&packed_commit->sha1, sizeof(git_oid));
if (error < 0)
goto cleanup;
}
@@ -1021,8 +1025,7 @@ commit_graph_write(git_commit_graph_writer *w, commit_graph_write_cb write_cb, v
size_t *packed_index;
unsigned int parentcount = (unsigned int)git_array_size(packed_commit->parents);
- error = git_buf_put(
- &commit_data,
+ error = git_buf_put(&commit_data,
(const char *)&packed_commit->tree_oid,
sizeof(git_oid));
if (error < 0)
@@ -1054,14 +1057,10 @@ commit_graph_write(git_commit_graph_writer *w, commit_graph_write_cb write_cb, v
unsigned int parent_i;
for (parent_i = 1; parent_i < parentcount; ++parent_i) {
packed_index = git_array_get(
- packed_commit->parent_indices, parent_i);
- word = htonl(
- (uint32_t)(*packed_index
- | (parent_i + 1 == parentcount
- ? 0x80000000u
- : 0)));
- error = git_buf_put(
- &extra_edge_list,
+ packed_commit->parent_indices, parent_i);
+ word = htonl((uint32_t)(*packed_index | (parent_i + 1 == parentcount ? 0x80000000u : 0)));
+
+ error = git_buf_put(&extra_edge_list,
(const char *)&word,
sizeof(word));
if (error < 0)