INdent properly

This commit is contained in:
Nils O. Selåsdal
2013-07-07 22:14:56 +02:00
parent bc3a5ba2ca
commit 1d01e6dc7e
+57 -58
View File
@@ -6,106 +6,105 @@
void
uc_dbuf_free(DBuf *buf)
{
if(buf != NULL)
free(buf->bufstart);
if (buf != NULL)
free(buf->bufstart);
}
int
uc_dbuf_init(DBuf *buf,size_t initlen)
int
uc_dbuf_init(DBuf *buf, size_t initlen)
{
unsigned char *tmp = malloc(initlen);
if(tmp == NULL)
return -1;
buf->start = buf->bufstart = buf->end = tmp;
buf->bufend = tmp + initlen;
unsigned char *tmp = malloc(initlen);
if (tmp == NULL)
return -1;
buf->start = buf->bufstart = buf->end = tmp;
buf->bufend = tmp + initlen;
return 0;
return 0;
}
size_t
size_t
uc_dbuf_len(DBuf *buf)
{
return buf->end - buf->start;
return buf->end - buf->start;
}
size_t
size_t
uc_dbuf_buflen(DBuf *buf)
{
return buf->bufend - buf->bufstart;
return buf->bufend - buf->bufstart;
}
size_t
uc_dbuf_remaining(DBuf *buf)
{
return buf->bufend - buf->end;
return buf->bufend - buf->end;
}
int
uc_dbuf_ensure(DBuf *buf,size_t capacity)
uc_dbuf_ensure(DBuf *buf, size_t capacity)
{
size_t sz,remaining,len;
remaining = uc_dbuf_remaining(buf);
if(remaining >= capacity)
return 0;
len = uc_dbuf_len(buf);
sz = buf->start - buf->bufstart;
memmove(buf->bufstart,buf->start,len);
if(sz + remaining < capacity) {
size_t newlen = uc_dbuf_buflen(buf) + capacity;
void *tmp = realloc(buf->bufstart,newlen);
if(tmp == NULL)
return 1;
buf->bufstart = tmp;
buf->bufend = buf->bufstart + newlen;
size_t sz, remaining, len;
}
buf->start = buf->bufstart;
buf->end = buf->start + len;
return 0;
remaining = uc_dbuf_remaining(buf);
if (remaining >= capacity)
return 0;
len = uc_dbuf_len(buf);
sz = buf->start - buf->bufstart;
memmove(buf->bufstart, buf->start, len);
if (sz + remaining < capacity) {
size_t newlen = uc_dbuf_buflen(buf) + capacity;
void *tmp = realloc(buf->bufstart, newlen);
if (tmp == NULL)
return 1;
buf->bufstart = tmp;
buf->bufend = buf->bufstart + newlen;
}
buf->start = buf->bufstart;
buf->end = buf->start + len;
return 0;
}
void
uc_dbuf_trim(DBuf *buf)
{
size_t len = uc_dbuf_len(buf);
void *tmp;
size_t len = uc_dbuf_len(buf);
void *tmp;
if(len == 0)
return;
if (len == 0)
return;
memmove(buf->bufstart,buf->start,len);
memmove(buf->bufstart, buf->start, len);
tmp = realloc(buf->bufstart,len);
if(tmp != NULL)
buf->bufstart = tmp;
tmp = realloc(buf->bufstart, len);
if (tmp != NULL)
buf->bufstart = tmp;
buf->start = buf->bufstart;
buf->bufend = buf->end = buf->bufstart + len;
buf->start = buf->bufstart;
buf->bufend = buf->end = buf->bufstart + len;
}
int
uc_dbuf_take(DBuf *buf,size_t len)
int
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) {
buf->start = buf->end = buf->bufstart;
} else if (len < buflen) {
buf->start = buf->start + len;
if (len == buflen) {
buf->start = buf->end = buf->bufstart;
} else if (len < buflen) {
buf->start = buf->start + len;
} else {
//should maybe assert. This is a serious offence
return 1;
return 1;
}
return 0;
return 0;
}
void
uc_dbuf_added(DBuf *buf,size_t len)
uc_dbuf_added(DBuf *buf, size_t len)
{
assert(len <= uc_dbuf_remaining(buf));
buf->end +=len;
buf->end += len;
}