xfer: Rename the receive buffer

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

diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index 1210d76e8eec06170f600dcf6206b6d8f8dcf522..ec18dac0d3c206b49def0afdea3695f1bf00c78f 100644 (file)
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -118,8 +118,8 @@ struct pakfire_xfer {
        // WebSocket Receive Buffer
        struct pakfire_xfer_buffer {
                char* data;
-               size_t size;
-       } buffer;
+               size_t length;
+       } recv_buffer;
 };
 
 static void pakfire_xfer_free(struct pakfire_xfer* xfer) {
@@ -135,9 +135,9 @@ static void pakfire_xfer_free(struct pakfire_xfer* xfer) {
        if (xfer->event)
                sd_event_source_unref(xfer->event);
 
-       // Buffer
-       if (xfer->buffer.data)
-               free(xfer->buffer.data);
+       // Receive Buffer
+       if (xfer->recv_buffer.data)
+               free(xfer->recv_buffer.data);
 
        // Query Arguments
        if (xfer->queries)
@@ -963,18 +963,18 @@ static const char* curl_http_version(long v) {
        return "unknown";
 }
 
-static int pakfire_xfer_allocate(struct pakfire_xfer* xfer, size_t size) {
+static int pakfire_xfer_allocate(struct pakfire_xfer* xfer, size_t length) {
 
        // Otherwise, we resize the buffer
-       xfer->buffer.data = pakfire_realloc(xfer->buffer.data, size);
-       if (!xfer->buffer.data) {
+       xfer->recv_buffer.data = pakfire_realloc(xfer->recv_buffer.data, length);
+       if (!xfer->recv_buffer.data) {
                ERROR(xfer->ctx, "Could not allocate memory: %m\n");
 
                return -errno;
        }
 
-       // Update the size
-       xfer->buffer.size = size;
+       // Update the length
+       xfer->recv_buffer.length = length;
 
        return 0;
 }
@@ -1030,13 +1030,13 @@ static int pakfire_xfer_socket_recv(struct pakfire_xfer* xfer) {
                return r;
 
        // Copy the received message
-       memcpy(xfer->buffer.data + meta->offset, buffer, bytes_received);
+       memcpy(xfer->recv_buffer.data + meta->offset, buffer, bytes_received);
 
        // Call again if this was not the entire message
        if (meta->flags & CURLWS_CONT)
                return pakfire_xfer_socket_recv(xfer);
 
-       DEBUG(xfer->ctx, "We have received a message of %zu byte(s)\n", xfer->buffer.size);
+       DEBUG(xfer->ctx, "We have received a message of %zu byte(s)\n", xfer->recv_buffer.length);
 
        if (meta->flags & CURLWS_TEXT) {
                DEBUG(xfer->ctx, "The message is a text\n");
@@ -1046,7 +1046,7 @@ static int pakfire_xfer_socket_recv(struct pakfire_xfer* xfer) {
 
        // Once we have received the entire message we call the callback
        if (xfer->callbacks.recv) {
-               r = xfer->callbacks.recv(xfer, xfer->buffer.data, xfer->buffer.size, xfer->callbacks.data);
+               r = xfer->callbacks.recv(xfer, xfer->recv_buffer.data, xfer->recv_buffer.length, xfer->callbacks.data);
                if (r)
                        return r;
        }