buffer: Give the functions slightly better names

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/buffer.c b/src/pakfire/buffer.c
index adf3f8d7c436ff36441ada3fe1d7ba02809e0ae9..6bf76bda26f1295179ba1415e6a3dd70de8dc237 100644 (file)
--- 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 2a3a88509f4eab601058dd7de9c73d441209a4bf..7951ef0a30046e3968f55c55b25209e85b6553c8 100644 (file)
--- 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 de507c9725d5cf274e7347f3cd88867685556d9b..740b1efc2528787f11ce128e57e577f9eecd000d 100644 (file)
--- 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;