dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-08 17:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch-object-info: pass arguments directly instead of a struct

Browse Source 
struct object_info_args groups three pointers that already live in the
transport and are given to fetch_object_info().
Grouping them into a struct reduces the number of parameters, but it
suggests that the three belong together, when they are unrelated and end
up being accessed as args->* independently.

Drop the struct and pass those parameters directly to
fetch_object_info() and send_object_info_request(). This should have no
change in behavior.

Helped-by: Jeff King <peff@peff.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Karthik Nayak <karthik.188@gmail.com>
Mentored-by: Chandra Pratap <chandrapratap3519@gmail.com>
Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pablo Sabater
2026-08-04 20:42:57 +02:00
committed by Junio C Hamano
parent 76a3123e2f
commit 1f3fba128f
3 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
fetch-object-info.c
View File

@@ -9,20 +9,24 @@
#include "string-list.h"
/* Sends object-info command and its arguments into the request buffer. */
static void send_object_info_request(const int fd_out, struct object_info_args *args)
static void send_object_info_request(const int fd_out,
const struct string_list *server_options,
struct oid_array *oids,
struct string_list *object_info_options)
{
struct strbuf req_buf = STRBUF_INIT;
write_command_and_capabilities(&req_buf, "object-info", args->server_options);
write_command_and_capabilities(&req_buf, "object-info", server_options);
if (unsorted_string_list_has_string(args->object_info_options, "size"))
if (unsorted_string_list_has_string(object_info_options, "size"))
packet_buf_write(&req_buf, "size");
else if (args->object_info_options->nr)
else if (object_info_options->nr)
BUG("only size should be in object_info_options");
if (args->oids)
for (size_t i = 0; i < args->oids->nr; i++)
packet_buf_write(&req_buf, "oid %s", oid_to_hex(&args->oids->oid[i]));
if (oids)
for (size_t i = 0; i < oids->nr; i++)
packet_buf_write(&req_buf, "oid %s",
oid_to_hex(&oids->oid[i]));
packet_buf_flush(&req_buf);
if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0)
@@ -45,8 +49,12 @@ static int parse_object_size(const char *s, size_t *res)
return 0;
}
int fetch_object_info(const enum protocol_version version, struct object_info_args *args,
struct packet_reader *reader, struct object_info *object_info_data,
int fetch_object_info(const enum protocol_version version,
const struct string_list *server_options,
struct oid_array *oids,
struct string_list *object_info_options,
struct packet_reader *reader,
struct object_info *object_info_data,
const int stateless_rpc, const int fd_out)
{
int size_index = -1;
@@ -64,16 +72,17 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
* because the number of options is a small known number (the
* supported placeholders which currently are size and type).
*/
for (int i = (int)args->object_info_options->nr - 1; i >= 0; i--)
for (int i = (int)object_info_options->nr - 1; i >= 0; i--)
if (!server_supports_feature("object-info",
args->object_info_options->items[i].string, 0))
unsorted_string_list_delete_item(args->object_info_options, i, 0);
object_info_options->items[i].string, 0))
unsorted_string_list_delete_item(object_info_options, i, 0);
/*
* Even if no options are left, we still send the oid so we get
* at least an existence check.
*/
send_object_info_request(fd_out, args);
send_object_info_request(fd_out, server_options, oids,
object_info_options);
break;
case protocol_v1:
case protocol_v0:
@@ -82,14 +91,14 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
BUG("unknown protocol version");
}
for (size_t i = 0; i < args->object_info_options->nr; i++) {
for (size_t i = 0; i < object_info_options->nr; i++) {
if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
check_stateless_delimiter(stateless_rpc, reader,
"stateless delimiter expected");
return -1;
}
if (!unsorted_string_list_has_string(args->object_info_options, reader->line))
if (!unsorted_string_list_has_string(object_info_options, reader->line))
return -1;
if (!strcmp(reader->line, "size")) {
@@ -98,7 +107,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
* is only size. No risk of overflow.
*/
size_index = (int)i;
for (size_t j = 0; j < args->oids->nr; j++)
for (size_t j = 0; j < oids->nr; j++)
object_info_data[j].sizep =
xcalloc(1, sizeof(*object_info_data[j].sizep));
} else {
@@ -106,19 +115,19 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
}
}
for (size_t i = 0; i < args->oids->nr; i++) {
for (size_t i = 0; i < oids->nr; i++) {
struct string_list object_info_values = STRING_LIST_INIT_DUP;
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
die(_("object-info: expected %" PRIuMAX " objects, got %" PRIuMAX),
(uintmax_t)args->oids->nr, (uintmax_t)i);
(uintmax_t)oids->nr, (uintmax_t)i);
string_list_split(&object_info_values, reader->line, " ", -1);
if (strcmp(object_info_values.items[0].string,
oid_to_hex(&args->oids->oid[i])))
oid_to_hex(&oids->oid[i])))
die(_("object-info: expected OID: %s, got %s"),
oid_to_hex(&args->oids->oid[i]),
oid_to_hex(&oids->oid[i]),
object_info_values.items[0].string);
/*
@@ -138,7 +147,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
* the server we expect the server to answer with the same
* number of attributes requested.
*/
if (args->object_info_options->nr + 1 != object_info_values.nr)
if (object_info_options->nr + 1 != object_info_values.nr)
die("object-info: unexpected number of attributes: %s",
reader->line);
@@ -154,7 +163,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
if (packet_reader_read(reader) != PACKET_READ_FLUSH)
die(_("object-info: expected flush after %"PRIuMAX" objects"),
(uintmax_t)args->oids->nr);
(uintmax_t)oids->nr);
check_stateless_delimiter(stateless_rpc, reader, "stateless delimiter expected");

17
fetch-object-info.h
View File

@@ -4,22 +4,21 @@
#include "pkt-line.h"
#include "protocol.h"
struct object_info_args {
struct string_list *object_info_options;
const struct string_list *server_options;
struct oid_array *oids;
};
struct object_info;
struct oid_array;
/*
* Sends git-cat-file object-info command into the request buf and read the
* results from packets.
*
* Modifies args->object_info_options, on return it contains only the supported
* Modifies object_info_options, on return it contains only the supported
* options by the server.
*/
int fetch_object_info(enum protocol_version version, struct object_info_args *args,
struct packet_reader *reader, struct object_info *object_info_data,
int fetch_object_info(enum protocol_version version,
const struct string_list *server_options,
struct oid_array *oids,
struct string_list *object_info_options,
struct packet_reader *reader,
struct object_info *object_info_data,
int stateless_rpc, int fd_out);
#endif /* FETCH_OBJECT_INFO_H */

11
transport.c
View File

@@ -438,11 +438,6 @@ static int fetch_object_info_via_pack(struct transport *transport)
int ret = 0;
struct git_transport_data *data = transport->data;
struct packet_reader reader;
struct object_info_args args = { 0 };
args.server_options = transport->server_options;
args.oids = transport->smart_options->object_info_oids;
args.object_info_options = transport->smart_options->object_info_options;
connect_setup(transport, 0);
packet_reader_init(&reader, data->fd[0], NULL, 0,
@@ -453,7 +448,11 @@ static int fetch_object_info_via_pack(struct transport *transport)
data->version = discover_version(&reader);
transport->hash_algo = reader.hash_algo;
ret = fetch_object_info(data->version, &args, &reader,
ret = fetch_object_info(data->version,
transport->server_options,
transport->smart_options->object_info_oids,
transport->smart_options->object_info_options,
&reader,
data->options.object_info_data,
transport->stateless_rpc, data->fd[1]);