From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6hv-0003Wu-3t for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF6hu-0001Bj-5M for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:08:03 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:45468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6hu-0001BX-01 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:08:02 -0400 Received: by padfb10 with SMTP id fb10so506989pad.4 for ; Fri, 21 Sep 2012 10:08:01 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <505C9EEB.80108@redhat.com> Date: Fri, 21 Sep 2012 19:07:55 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1348236500-2565-1-git-send-email-quintela@redhat.com> <1348236500-2565-13-git-send-email-quintela@redhat.com> In-Reply-To: <1348236500-2565-13-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 12/14] buffered_file: unfold buffered_append in buffered_put_buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org Il 21/09/2012 16:08, Juan Quintela ha scritto: > It was the only user, and now buffered_put_buffer just do the append > > Signed-off-by: Juan Quintela > --- > buffered_file.c | 33 ++++++++++++++------------------- > 1 file changed, 14 insertions(+), 19 deletions(-) > > diff --git a/buffered_file.c b/buffered_file.c > index 929b911..1b261ec 100644 > --- a/buffered_file.c > +++ b/buffered_file.c > @@ -42,22 +42,6 @@ typedef struct QEMUFileBuffered > do { } while (0) > #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 int buffered_flush(QEMUFileBuffered *s) > { > size_t offset = 0; > @@ -102,11 +86,22 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in > return error; > } > > - if (size > 0) { > - DPRINTF("buffering %d bytes\n", size - offset); > - buffered_append(s, buf, size); > + if (size <= 0) { > + return 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; > } > Ah, finally this arrived as well. :) Reviewed-by: Paolo Bonzini