From a8143661a53c2e0f83d9ae883c2cfa9e62b7c109 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 22 Mar 2025 18:07:09 +0000 Subject: [PATCH] buffer: Give the functions slightly better names Signed-off-by: Michael Tremer --- src/pakfire/buffer.c | 6 +++--- src/pakfire/buffer.h | 6 +++--- src/pakfire/log_stream.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pakfire/buffer.c b/src/pakfire/buffer.c index adf3f8d7..6bf76bda 100644 --- a/src/pakfire/buffer.c +++ b/src/pakfire/buffer.c @@ -70,7 +70,7 @@ static int pakfire_buffer_shrink(struct pakfire_buffer* self) { return pakfire_buffer_resize(self, self->length); } -int pakfire_buffer_append(struct pakfire_buffer* self, const char* data, size_t length) { +int pakfire_buffer_push(struct pakfire_buffer* self, const char* data, size_t length) { int r; // Check inputs @@ -93,7 +93,7 @@ int pakfire_buffer_append(struct pakfire_buffer* self, const char* data, size_t return 0; } -int pakfire_buffer_append_from_fd(struct pakfire_buffer* self, int fd) { +int pakfire_buffer_push_from_fd(struct pakfire_buffer* self, int fd) { ssize_t bytes_read = 0; int r; @@ -120,7 +120,7 @@ int pakfire_buffer_append_from_fd(struct pakfire_buffer* self, int fd) { return 0; } -int pakfire_buffer_consume(struct pakfire_buffer* self, size_t length) { +int pakfire_buffer_pop(struct pakfire_buffer* self, size_t length) { // Check if we actually have enough data if (self->used < length) return -EINVAL; diff --git a/src/pakfire/buffer.h b/src/pakfire/buffer.h index 2a3a8850..7951ef0a 100644 --- a/src/pakfire/buffer.h +++ b/src/pakfire/buffer.h @@ -34,10 +34,10 @@ struct pakfire_buffer { void pakfire_buffer_free(struct pakfire_buffer* buffer); -int pakfire_buffer_append(struct pakfire_buffer* self, const char* data, size_t length); -int pakfire_buffer_append_from_fd(struct pakfire_buffer* self, int fd); +int pakfire_buffer_push(struct pakfire_buffer* self, const char* data, size_t length); +int pakfire_buffer_push_from_fd(struct pakfire_buffer* self, int fd); -int pakfire_buffer_consume(struct pakfire_buffer* self, size_t length); +int pakfire_buffer_pop(struct pakfire_buffer* self, size_t length); size_t pakfire_buffer_find_line(struct pakfire_buffer* self); diff --git a/src/pakfire/log_stream.c b/src/pakfire/log_stream.c index de507c97..740b1efc 100644 --- a/src/pakfire/log_stream.c +++ b/src/pakfire/log_stream.c @@ -265,7 +265,7 @@ static int pakfire_log_stream_drain_buffer(struct pakfire_log_stream* stream) { return r; // Consume the data - pakfire_buffer_consume(&stream->buffer, length); + pakfire_buffer_pop(&stream->buffer, length); } return 0; @@ -277,7 +277,7 @@ static int __pakfire_log_stream(sd_event_source* s, int fd, uint32_t events, voi if (events & EPOLLIN) { // Fill the buffer - r = pakfire_buffer_append_from_fd(&stream->buffer, fd); + r = pakfire_buffer_push_from_fd(&stream->buffer, fd); if (r < 0) return r; @@ -392,8 +392,8 @@ int pakfire_log_stream_pty(struct pakfire_ctx* ctx, void* data, const char* buff struct pakfire_log_stream* self = data; int r; - // Append the data to the buffer - r = pakfire_buffer_append(&self->buffer, buffer, length); + // Push the data into the buffer + r = pakfire_buffer_push(&self->buffer, buffer, length); if (r < 0) return r; -- 2.39.5