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

odb/streaming: rename struct read_object_fd_data

Browse Source 
With the preceding refactorings the `struct read_object_fd_data` is now
somewhat misnamed, as it doesn't only contain the data anymore, but also
the stream itself. Rename the structure to `struct fd_stream` to better
match the new structure.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2026-08-05 09:44:50 +02:00
committed by Junio C Hamano
parent e837b812fe
commit 93dd24603b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
odb/streaming.c
View File

@@ -288,33 +288,33 @@ int odb_stream_blob_to_fd(struct object_database *odb,
return result;
}
struct read_object_fd_data {
struct fd_stream {
struct odb_stream base;
int fd;
size_t remaining;
};
static ssize_t read_object_fd(struct odb_stream *stream,
static ssize_t fd_stream_read(struct odb_stream *stream,
char *buf, size_t len)
{
struct read_object_fd_data *data = container_of(stream, struct read_object_fd_data, base);
struct fd_stream *fds = container_of(stream, struct fd_stream, base);
ssize_t read_result;
size_t count;
if (!data->remaining)
if (!fds->remaining)
return 0;
count = data->remaining < len ? data->remaining : len;
read_result = read_in_full(data->fd, buf, count);
count = fds->remaining < len ? fds->remaining : len;
read_result = read_in_full(fds->fd, buf, count);
if (read_result < 0 || (size_t)read_result != count)
return -1;
data->remaining -= count;
fds->remaining -= count;
return read_result;
}
static int close_object_fd(struct odb_stream *stream UNUSED)
static int fd_stream_close(struct odb_stream *stream UNUSED)
{
/* The file descriptor is owned by the caller for now. */
return 0;
@@ -322,15 +322,15 @@ static int close_object_fd(struct odb_stream *stream UNUSED)
struct odb_stream *odb_write_stream_from_fd(int fd, size_t size, enum object_type type)
{
struct read_object_fd_data *data;
struct fd_stream *fds;
CALLOC_ARRAY(data, 1);
data->base.read = read_object_fd;
data->base.close = close_object_fd;
data->base.size = size;
data->base.type = type;
data->fd = fd;
data->remaining = size;
CALLOC_ARRAY(fds, 1);
fds->base.read = fd_stream_read;
fds->base.close = fd_stream_close;
fds->base.size = size;
fds->base.type = type;
fds->fd = fd;
fds->remaining = size;
return &data->base;
return &fds->base;
}