mirror of https://github.com/proxmox/mirror_qemu
buffered_file: unfold buffered_append in buffered_put_buffer
It was the only user, and now buffered_put_buffer just do the append Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>master
parent
c518dd841d
commit
f50b4986b2
|
@ -41,22 +41,6 @@ typedef struct QEMUFileBuffered
|
||||||
do { } while (0)
|
do { } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void buffered_append(QEMUFileBuffered *s,
|
|
||||||
const uint8_t *buf, size_t size)
|
|
||||||
{
|
|
||||||
if (size > (s->buffer_capacity - s->buffer_size)) {
|
|
||||||
DPRINTF("increasing buffer capacity from %zu by %zu\n",
|
|
||||||
s->buffer_capacity, size + 1024);
|
|
||||||
|
|
||||||
s->buffer_capacity += size + 1024;
|
|
||||||
|
|
||||||
s->buffer = g_realloc(s->buffer, s->buffer_capacity);
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(s->buffer + s->buffer_size, buf, size);
|
|
||||||
s->buffer_size += size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t buffered_flush(QEMUFileBuffered *s)
|
static ssize_t buffered_flush(QEMUFileBuffered *s)
|
||||||
{
|
{
|
||||||
size_t offset = 0;
|
size_t offset = 0;
|
||||||
|
@ -101,11 +85,22 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (size > 0) {
|
if (size <= 0) {
|
||||||
DPRINTF("buffering %d bytes\n", size - offset);
|
return size;
|
||||||
buffered_append(s, buf, size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (size > (s->buffer_capacity - s->buffer_size)) {
|
||||||
|
DPRINTF("increasing buffer capacity from %zu by %zu\n",
|
||||||
|
s->buffer_capacity, size + 1024);
|
||||||
|
|
||||||
|
s->buffer_capacity += size + 1024;
|
||||||
|
|
||||||
|
s->buffer = g_realloc(s->buffer, s->buffer_capacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(s->buffer + s->buffer_size, buf, size);
|
||||||
|
s->buffer_size += size;
|
||||||
|
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue