Mercurial > code
changeset 5:0ed27735fa87
Fix bad order
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 06 Sep 2011 18:58:05 +0200 |
parents | e19a50d6a5be |
children | 25cc379de564 |
files | buffer.c |
diffstat | 1 files changed, 3 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/buffer.c Tue Sep 06 18:55:19 2011 +0200 +++ b/buffer.c Tue Sep 06 18:58:05 2011 +0200 @@ -38,20 +38,12 @@ return NULL; memset(buf, 0, sizeof (struct buffer)); - - if (bsize == 0) - bsize = BUFFER_DEFAULT_BSIZE; - - if (!(buf->data = calloc(bsize + 1, 1))) { - free(buf); - return NULL; - } - + buf->bsize = (bsize == 0) ? BUFFER_DEFAULT_BSIZE : bsize; buf->size = bsize + 1; - buf->bsize = bsize; buf->flags = flags; - if (str && buffer_strcat(buf, str) < 0) { + if (!(buf->data = calloc(bsize + 1, 1)) || + (str && buffer_strcat(buf, str) < 0)) { free(buf); return NULL; }