input_curl: moved code to consume_buffer()

src/input_curl.c

@@ -207,20 +207,22 @@ input_curl_select(struct input_curl *c)
 	return ret;
 }
 
-static size_t
-read_from_buffer(struct buffer *buffer, void *dest, size_t length,
+/**
+ * Mark a part of the buffer object as consumed.
+ */
+static void
+consume_buffer(struct buffer *buffer, size_t length,
 	       struct list_head *rewind_head)
 {
-	assert(buffer->size > 0);
+	assert(buffer != NULL);
 	assert(buffer->consumed < buffer->size);
 
-	if (length > buffer->size - buffer->consumed)
-		length = buffer->size - buffer->consumed;
+	buffer->consumed += length;
+	if (buffer->consumed < buffer->size)
+		return;
 
-	memcpy(dest, buffer->data + buffer->consumed, length);
+	assert(buffer->consumed == buffer->size);
 
-	buffer->consumed += length;
-	if (buffer->consumed == buffer->size) {
 	list_del(&buffer->siblings);
 
 	if (rewind_head != NULL)
@@ -228,8 +230,20 @@ read_from_buffer(struct buffer *buffer, void *dest, size_t length,
 		list_add_tail(&buffer->siblings, rewind_head);
 	else
 		g_free(buffer);
-	}
+}
+
+static size_t
+read_from_buffer(struct buffer *buffer, void *dest, size_t length,
+		 struct list_head *rewind_head)
+{
+	assert(buffer->size > 0);
+	assert(buffer->consumed < buffer->size);
+
+	if (length > buffer->size - buffer->consumed)
+		length = buffer->size - buffer->consumed;
 
+	memcpy(dest, buffer->data + buffer->consumed, length);
+	consume_buffer(buffer, length, rewind_head);
 	return length;
 }