commit-graph: anonymize data in chunk_write_fn

derrickstolee · gitster · commit eb9071912f5c · 2021-02-05T15:40:41.000-08:00
In preparation for creating an API around file formats using chunks and
tables of contents, prepare the commit-graph write code to use
prototypes that will match this new API.

Specifically, convert chunk_write_fn to take a "void *data" parameter
instead of the commit-graph-specific "struct write_commit_graph_context"
pointer.

Signed-off-by: Derrick Stolee &lt;dstolee@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/commit-graph.c b/commit-graph.c
@@ -1040,8 +1040,9 @@ struct write_commit_graph_context {
 };
 
 static int write_graph_chunk_fanout(struct hashfile *f,
-				    struct write_commit_graph_context *ctx)
+				    void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int i, count = 0;
 	struct commit **list = ctx->commits.list;
 
@@ -1066,8 +1067,9 @@ static int write_graph_chunk_fanout(struct hashfile *f,
 }
 
 static int write_graph_chunk_oids(struct hashfile *f,
-				  struct write_commit_graph_context *ctx)
+				  void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	int count;
 	for (count = 0; count < ctx->commits.nr; count++, list++) {
@@ -1085,8 +1087,9 @@ static const unsigned char *commit_to_sha1(size_t index, void *table)
 }
 
 static int write_graph_chunk_data(struct hashfile *f,
-				  struct write_commit_graph_context *ctx)
+				  void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 	uint32_t num_extra_edges = 0;
@@ -1187,8 +1190,9 @@ static int write_graph_chunk_data(struct hashfile *f,
 }
 
 static int write_graph_chunk_generation_data(struct hashfile *f,
-					      struct write_commit_graph_context *ctx)
+					     void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int i, num_generation_data_overflows = 0;
 
 	for (i = 0; i < ctx->commits.nr; i++) {
@@ -1208,8 +1212,9 @@ static int write_graph_chunk_generation_data(struct hashfile *f,
 }
 
 static int write_graph_chunk_generation_data_overflow(struct hashfile *f,
-						       struct write_commit_graph_context *ctx)
+						      void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int i;
 	for (i = 0; i < ctx->commits.nr; i++) {
 		struct commit *c = ctx->commits.list[i];
@@ -1226,8 +1231,9 @@ static int write_graph_chunk_generation_data_overflow(struct hashfile *f,
 }
 
 static int write_graph_chunk_extra_edges(struct hashfile *f,
-					 struct write_commit_graph_context *ctx)
+					 void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 	struct commit_list *parent;
@@ -1280,8 +1286,9 @@ static int write_graph_chunk_extra_edges(struct hashfile *f,
 }
 
 static int write_graph_chunk_bloom_indexes(struct hashfile *f,
-					   struct write_commit_graph_context *ctx)
+					   void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 	uint32_t cur_pos = 0;
@@ -1315,8 +1322,9 @@ static void trace2_bloom_filter_settings(struct write_commit_graph_context *ctx)
 }
 
 static int write_graph_chunk_bloom_data(struct hashfile *f,
-					struct write_commit_graph_context *ctx)
+					void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 
@@ -1737,8 +1745,9 @@ static int write_graph_chunk_base_1(struct hashfile *f,
 }
 
 static int write_graph_chunk_base(struct hashfile *f,
-				  struct write_commit_graph_context *ctx)
+				    void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int num = write_graph_chunk_base_1(f, ctx->new_base_graph);
 
 	if (num != ctx->num_commit_graphs_after - 1) {
@@ -1750,7 +1759,7 @@ static int write_graph_chunk_base(struct hashfile *f,
 }
 
 typedef int (*chunk_write_fn)(struct hashfile *f,
-			      struct write_commit_graph_context *ctx);
+			      void *data);
 
 struct chunk_info {
 	uint32_t id;

Original file line number	Diff line number	Diff line change
`@@ -1040,8 +1040,9 @@ struct write_commit_graph_context {`
`1040`	`1040`	`};`
`1041`	`1041`
`1042`	`1042`	`static int write_graph_chunk_fanout(struct hashfile *f,`
`1043`		`- struct write_commit_graph_context *ctx)`
	`1043`	`+ void *data)`
`1044`	`1044`	`{`
	`1045`	`+ struct write_commit_graph_context *ctx = data;`
`1045`	`1046`	`int i, count = 0;`
`1046`	`1047`	`struct commit **list = ctx->commits.list;`
`1047`	`1048`
`@@ -1066,8 +1067,9 @@ static int write_graph_chunk_fanout(struct hashfile *f,`
`1066`	`1067`	`}`
`1067`	`1068`
`1068`	`1069`	`static int write_graph_chunk_oids(struct hashfile *f,`
`1069`		`- struct write_commit_graph_context *ctx)`
	`1070`	`+ void *data)`
`1070`	`1071`	`{`
	`1072`	`+ struct write_commit_graph_context *ctx = data;`
`1071`	`1073`	`struct commit **list = ctx->commits.list;`
`1072`	`1074`	`int count;`
`1073`	`1075`	`for (count = 0; count < ctx->commits.nr; count++, list++) {`
`@@ -1085,8 +1087,9 @@ static const unsigned char commit_to_sha1(size_t index, void table)`
`1085`	`1087`	`}`
`1086`	`1088`
`1087`	`1089`	`static int write_graph_chunk_data(struct hashfile *f,`
`1088`		`- struct write_commit_graph_context *ctx)`
	`1090`	`+ void *data)`
`1089`	`1091`	`{`
	`1092`	`+ struct write_commit_graph_context *ctx = data;`
`1090`	`1093`	`struct commit **list = ctx->commits.list;`
`1091`	`1094`	`struct commit **last = ctx->commits.list + ctx->commits.nr;`
`1092`	`1095`	`uint32_t num_extra_edges = 0;`
`@@ -1187,8 +1190,9 @@ static int write_graph_chunk_data(struct hashfile *f,`
`1187`	`1190`	`}`
`1188`	`1191`
`1189`	`1192`	`static int write_graph_chunk_generation_data(struct hashfile *f,`
`1190`		`- struct write_commit_graph_context *ctx)`
	`1193`	`+ void *data)`
`1191`	`1194`	`{`
	`1195`	`+ struct write_commit_graph_context *ctx = data;`
`1192`	`1196`	`int i, num_generation_data_overflows = 0;`
`1193`	`1197`
`1194`	`1198`	`for (i = 0; i < ctx->commits.nr; i++) {`
`@@ -1208,8 +1212,9 @@ static int write_graph_chunk_generation_data(struct hashfile *f,`
`1208`	`1212`	`}`
`1209`	`1213`
`1210`	`1214`	`static int write_graph_chunk_generation_data_overflow(struct hashfile *f,`
`1211`		`- struct write_commit_graph_context *ctx)`
	`1215`	`+ void *data)`
`1212`	`1216`	`{`
	`1217`	`+ struct write_commit_graph_context *ctx = data;`
`1213`	`1218`	`int i;`
`1214`	`1219`	`for (i = 0; i < ctx->commits.nr; i++) {`
`1215`	`1220`	`struct commit *c = ctx->commits.list[i];`
`@@ -1226,8 +1231,9 @@ static int write_graph_chunk_generation_data_overflow(struct hashfile *f,`
`1226`	`1231`	`}`
`1227`	`1232`
`1228`	`1233`	`static int write_graph_chunk_extra_edges(struct hashfile *f,`
`1229`		`- struct write_commit_graph_context *ctx)`
	`1234`	`+ void *data)`
`1230`	`1235`	`{`
	`1236`	`+ struct write_commit_graph_context *ctx = data;`
`1231`	`1237`	`struct commit **list = ctx->commits.list;`
`1232`	`1238`	`struct commit **last = ctx->commits.list + ctx->commits.nr;`
`1233`	`1239`	`struct commit_list *parent;`
`@@ -1280,8 +1286,9 @@ static int write_graph_chunk_extra_edges(struct hashfile *f,`
`1280`	`1286`	`}`
`1281`	`1287`
`1282`	`1288`	`static int write_graph_chunk_bloom_indexes(struct hashfile *f,`
`1283`		`- struct write_commit_graph_context *ctx)`
	`1289`	`+ void *data)`
`1284`	`1290`	`{`
	`1291`	`+ struct write_commit_graph_context *ctx = data;`
`1285`	`1292`	`struct commit **list = ctx->commits.list;`
`1286`	`1293`	`struct commit **last = ctx->commits.list + ctx->commits.nr;`
`1287`	`1294`	`uint32_t cur_pos = 0;`
`@@ -1315,8 +1322,9 @@ static void trace2_bloom_filter_settings(struct write_commit_graph_context *ctx)`
`1315`	`1322`	`}`
`1316`	`1323`
`1317`	`1324`	`static int write_graph_chunk_bloom_data(struct hashfile *f,`
`1318`		`- struct write_commit_graph_context *ctx)`
	`1325`	`+ void *data)`
`1319`	`1326`	`{`
	`1327`	`+ struct write_commit_graph_context *ctx = data;`
`1320`	`1328`	`struct commit **list = ctx->commits.list;`
`1321`	`1329`	`struct commit **last = ctx->commits.list + ctx->commits.nr;`
`1322`	`1330`
`@@ -1737,8 +1745,9 @@ static int write_graph_chunk_base_1(struct hashfile *f,`
`1737`	`1745`	`}`
`1738`	`1746`
`1739`	`1747`	`static int write_graph_chunk_base(struct hashfile *f,`
`1740`		`- struct write_commit_graph_context *ctx)`
	`1748`	`+ void *data)`
`1741`	`1749`	`{`
	`1750`	`+ struct write_commit_graph_context *ctx = data;`
`1742`	`1751`	`int num = write_graph_chunk_base_1(f, ctx->new_base_graph);`
`1743`	`1752`
`1744`	`1753`	`if (num != ctx->num_commit_graphs_after - 1) {`
`@@ -1750,7 +1759,7 @@ static int write_graph_chunk_base(struct hashfile *f,`
`1750`	`1759`	`}`
`1751`	`1760`
`1752`	`1761`	`typedef int (chunk_write_fn)(struct hashfile f,`
`1753`		`- struct write_commit_graph_context *ctx);`
	`1762`	`+ void *data);`
`1754`	`1763`
`1755`	`1764`	`struct chunk_info {`
`1756`	`1765`	`uint32_t id;`