noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INdent properly

Browse Source
This commit is contained in:
Nils O. Selåsdal
2013-07-07 22:14:56 +02:00
parent bc3a5ba2ca
commit 1d01e6dc7e
1 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbuf.c
+18 -19
View File
@@ -6,16 +6,15 @@
void void
uc_dbuf_free(DBuf *buf) uc_dbuf_free(DBuf *buf)
{ {
if(buf != NULL) if (buf != NULL)
free(buf->bufstart); free(buf->bufstart);
} }
int int
uc_dbuf_init(DBuf *buf,size_t initlen) uc_dbuf_init(DBuf *buf, size_t initlen)
{ {
unsigned char *tmp = malloc(initlen); unsigned char *tmp = malloc(initlen);
if(tmp == NULL) if (tmp == NULL)
return -1; return -1;
buf->start = buf->bufstart = buf->end = tmp; buf->start = buf->bufstart = buf->end = tmp;
buf->bufend = tmp + initlen; buf->bufend = tmp + initlen;
@@ -42,20 +41,20 @@ uc_dbuf_remaining(DBuf *buf)
} }
int int
uc_dbuf_ensure(DBuf *buf,size_t capacity) uc_dbuf_ensure(DBuf *buf, size_t capacity)
{ {
size_t sz,remaining,len; size_t sz, remaining, len;
remaining = uc_dbuf_remaining(buf); remaining = uc_dbuf_remaining(buf);
if(remaining >= capacity) if (remaining >= capacity)
return 0; return 0;
len = uc_dbuf_len(buf); len = uc_dbuf_len(buf);
sz = buf->start - buf->bufstart; sz = buf->start - buf->bufstart;
memmove(buf->bufstart,buf->start,len); memmove(buf->bufstart, buf->start, len);
if(sz + remaining < capacity) { if (sz + remaining < capacity) {
size_t newlen = uc_dbuf_buflen(buf) + capacity; size_t newlen = uc_dbuf_buflen(buf) + capacity;
void *tmp = realloc(buf->bufstart,newlen); void *tmp = realloc(buf->bufstart, newlen);
if(tmp == NULL) if (tmp == NULL)
return 1; return 1;
buf->bufstart = tmp; buf->bufstart = tmp;
buf->bufend = buf->bufstart + newlen; buf->bufend = buf->bufstart + newlen;
@@ -73,13 +72,13 @@ uc_dbuf_trim(DBuf *buf)
size_t len = uc_dbuf_len(buf); size_t len = uc_dbuf_len(buf);
void *tmp; void *tmp;
if(len == 0) if (len == 0)
return; return;
memmove(buf->bufstart,buf->start,len); memmove(buf->bufstart, buf->start, len);
tmp = realloc(buf->bufstart,len); tmp = realloc(buf->bufstart, len);
if(tmp != NULL) if (tmp != NULL)
buf->bufstart = tmp; buf->bufstart = tmp;
buf->start = buf->bufstart; buf->start = buf->bufstart;
@@ -87,11 +86,11 @@ uc_dbuf_trim(DBuf *buf)
} }
int int
uc_dbuf_take(DBuf *buf,size_t len) uc_dbuf_take(DBuf *buf, size_t len)
{ {
size_t buflen = uc_dbuf_len(buf); size_t buflen = uc_dbuf_len(buf);
if(len == buflen) { if (len == buflen) {
buf->start = buf->end = buf->bufstart; buf->start = buf->end = buf->bufstart;
} else if (len < buflen) { } else if (len < buflen) {
buf->start = buf->start + len; buf->start = buf->start + len;
@@ -104,8 +103,8 @@ uc_dbuf_take(DBuf *buf,size_t len)
} }
void void
uc_dbuf_added(DBuf *buf,size_t len) uc_dbuf_added(DBuf *buf, size_t len)
{ {
assert(len <= uc_dbuf_remaining(buf)); assert(len <= uc_dbuf_remaining(buf));
buf->end +=len; buf->end += len;
} }