Mercurial > code
changeset 160:bcf15f0d243f
Merge
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Fri, 03 Aug 2012 17:50:46 +0200 |
| parents | 996337564c4d (current diff) 94847374833b (diff) |
| children | 81d64d4a5473 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/array.c Fri Aug 03 17:50:28 2012 +0200 +++ b/array.c Fri Aug 03 17:50:46 2012 +0200 @@ -334,9 +334,7 @@ void array_clear(struct array *arr) { - if (arr->flags & ARRAY_CLEARBITS) - memset(arr->data, 0, arr->size); - + memset(arr->data, 0, arr->size); arr->length = 0; }
--- a/buf.c Fri Aug 03 17:50:28 2012 +0200 +++ b/buf.c Fri Aug 03 17:50:46 2012 +0200 @@ -217,7 +217,7 @@ (start < 0 && (int)buf->length + start < 0)) return; - if (start < 0 && buf->length + start >= 0) + if (start < 0 && (int)buf->length + start >= 0) start = buf->length + start; buf->text[start] = '\0';