Merge branch 'rs/object-name-extend-abbrev-len-update'

gitster · gitster · commit 5fe4f6304f10 · 2025-09-15T08:52:07.000-07:00
Code clean-up.

* rs/object-name-extend-abbrev-len-update:
  object-name: declare pointer type of extend_abbrev_len()'s 2nd parameter
diff --git a/object-name.c b/object-name.c
@@ -696,10 +696,9 @@ static inline char get_hex_char_from_oid(const struct object_id *oid,
 		return hex[oid->hash[pos >> 1] & 0xf];
 }
 
-static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
+static int extend_abbrev_len(const struct object_id *oid,
+			     struct min_abbrev_data *mad)
 {
-	struct min_abbrev_data *mad = cb_data;
-
 	unsigned int i = mad->init_len;
 	while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
 		i++;

Original file line number	Diff line number	Diff line change
`@@ -696,10 +696,9 @@ static inline char get_hex_char_from_oid(const struct object_id *oid,`
`696`	`696`	`return hex[oid->hash[pos >> 1] & 0xf];`
`697`	`697`	`}`
`698`	`698`
`699`		`-static int extend_abbrev_len(const struct object_id oid, void cb_data)`
	`699`	`+static int extend_abbrev_len(const struct object_id *oid,`
	`700`	`+ struct min_abbrev_data *mad)`
`700`	`701`	`{`
`701`		`- struct min_abbrev_data *mad = cb_data;`
`702`		`-`
`703`	`702`	`unsigned int i = mad->init_len;`
`704`	`703`	`while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))`
`705`	`704`	`i++;`