Mercurial > code

comparison buffer.c @ 5:0ed27735fa87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bad order
author David Demelier <markand@malikania.fr>
date Tue, 06 Sep 2011 18:58:05 +0200
parents e19a50d6a5be
children 520939b40002
comparison
equal deleted inserted replaced
4:e19a50d6a5be 5:0ed27735fa87
36 36
37 if (!(buf = malloc(sizeof (struct buffer)))) 37 if (!(buf = malloc(sizeof (struct buffer))))
38 return NULL; 38 return NULL;
39 39
40 memset(buf, 0, sizeof (struct buffer)); 40 memset(buf, 0, sizeof (struct buffer));
41 41 buf->bsize = (bsize == 0) ? BUFFER_DEFAULT_BSIZE : bsize;
42 if (bsize == 0)
43 bsize = BUFFER_DEFAULT_BSIZE;
44
45 if (!(buf->data = calloc(bsize + 1, 1))) {
46 free(buf);
47 return NULL;
48 }
49
50 buf->size = bsize + 1; 42 buf->size = bsize + 1;
51 buf->bsize = bsize;
52 buf->flags = flags; 43 buf->flags = flags;
53 44
54 if (str && buffer_strcat(buf, str) < 0) { 45 if (!(buf->data = calloc(bsize + 1, 1)) ||
46 (str && buffer_strcat(buf, str) < 0)) {
55 free(buf); 47 free(buf);
56 return NULL; 48 return NULL;
57 } 49 }
58 50
59 return buf; 51 return buf;