chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buffers: Rename buffer_if.len to buffer_if.alloclen.
[secnet.git]
/
util.c
diff --git
a/util.c
b/util.c
index de182a431445abdf34abc8b3f7dbf57f17ee919e..094870ff213cbc41c9f011aa1b316f646ee30992 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-247,7
+247,7
@@
void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)
{
void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)
{
- assert(max_start_pad<=buffer->len);
+ assert(max_start_pad<=buffer->
alloc
len);
buffer->start=buffer->base+max_start_pad;
buffer->size=0;
}
buffer->start=buffer->base+max_start_pad;
buffer->size=0;
}
@@
-300,7
+300,7
@@
void buffer_new(struct buffer_if *buf, int32_t len)
buf->loc.file=NULL;
buf->loc.line=0;
buf->size=0;
buf->loc.file=NULL;
buf->loc.line=0;
buf->size=0;
- buf->len=len;
+ buf->
alloc
len=len;
buf->start=NULL;
buf->base=safe_malloc(len,"buffer_new");
}
buf->start=NULL;
buf->base=safe_malloc(len,"buffer_new");
}
@@
-312,7
+312,7
@@
void buffer_readonly_view(struct buffer_if *buf, const void *data, int32_t len)
buf->flags=0;
buf->loc.file=NULL;
buf->loc.line=0;
buf->flags=0;
buf->loc.file=NULL;
buf->loc.line=0;
- buf->size=buf->len=len;
+ buf->size=buf->
alloc
len=len;
buf->base=buf->start=(uint8_t*)data;
}
buf->base=buf->start=(uint8_t*)data;
}
@@
-323,10
+323,10
@@
void buffer_readonly_clone(struct buffer_if *out, const struct buffer_if *in)
void buffer_copy(struct buffer_if *dst, const struct buffer_if *src)
{
void buffer_copy(struct buffer_if *dst, const struct buffer_if *src)
{
- if (dst->
len < src->
len) {
- dst->base=realloc(dst->base,src->len);
+ if (dst->
alloclen < src->alloc
len) {
+ dst->base=realloc(dst->base,src->
alloc
len);
if (!dst->base) fatal_perror("buffer_copy");
if (!dst->base) fatal_perror("buffer_copy");
- dst->
len = src->
len;
+ dst->
alloclen = src->alloc
len;
}
dst->start = dst->base + (src->start - src->base);
dst->size = src->size;
}
dst->start = dst->base + (src->start - src->base);
dst->size = src->size;