projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.1'
[jansson.git]
/
src
/
strbuffer.c
diff --git
a/src/strbuffer.c
b/src/strbuffer.c
index
ea74b6d
..
1a71a53
100644
(file)
--- a/
src/strbuffer.c
+++ b/
src/strbuffer.c
@@
-1,3
+1,10
@@
+/*
+ * Copyright (c) 2009 Petri Lehtinen <petri@digip.org>
+ *
+ * Jansson is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
@@
-7,22
+14,37
@@
#define STRBUFFER_MIN_SIZE 16
#define STRBUFFER_FACTOR 2
#define STRBUFFER_MIN_SIZE 16
#define STRBUFFER_FACTOR 2
-
void
strbuffer_init(strbuffer_t *strbuff)
+
int
strbuffer_init(strbuffer_t *strbuff)
{
{
- strbuff->
value = NULL
;
+ strbuff->
size = STRBUFFER_MIN_SIZE
;
strbuff->length = 0;
strbuff->length = 0;
- strbuff->size = 0;
+
+ strbuff->value = malloc(strbuff->size);
+ if(!strbuff->value)
+ return -1;
+
+ /* initialize to empty */
+ strbuff->value[0] = '\0';
+ return 0;
}
void strbuffer_close(strbuffer_t *strbuff)
{
free(strbuff->value);
}
void strbuffer_close(strbuffer_t *strbuff)
{
free(strbuff->value);
- strbuffer_init(strbuff);
+ strbuff->size = 0;
+ strbuff->length = 0;
+ strbuff->value = NULL;
+}
+
+void strbuffer_clear(strbuffer_t *strbuff)
+{
+ strbuff->length = 0;
+ strbuff->value[0] = '\0';
}
}
-c
har *strbuffer_value(
strbuffer_t *strbuff)
+c
onst char *strbuffer_value(const
strbuffer_t *strbuff)
{
{
- return str
dup(strbuff->value)
;
+ return str
buff->value
;
}
char *strbuffer_steal_value(strbuffer_t *strbuff)
}
char *strbuffer_steal_value(strbuffer_t *strbuff)
@@
-37,26
+59,37
@@
int strbuffer_append(strbuffer_t *strbuff, const char *string)
return strbuffer_append_bytes(strbuff, string, strlen(string));
}
return strbuffer_append_bytes(strbuff, string, strlen(string));
}
+int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
+{
+ return strbuffer_append_bytes(strbuff, &byte, 1);
+}
+
int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, int size)
{
int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, int size)
{
- if(strbuff->length + size > strbuff->size)
+ if(strbuff->length + size >
=
strbuff->size)
{
{
- if(strbuff->length == 0)
- strbuff->size = STRBUFFER_MIN_SIZE;
- else
- strbuff->size = max(strbuff->size * STRBUFFER_FACTOR,
- strbuff->length + size + 1);
+ strbuff->size = max(strbuff->size * STRBUFFER_FACTOR,
+ strbuff->length + size + 1);
strbuff->value = realloc(strbuff->value, strbuff->size);
if(!strbuff->value)
return -1;
strbuff->value = realloc(strbuff->value, strbuff->size);
if(!strbuff->value)
return -1;
-
- memset(strbuff->value + strbuff->length + size, 0,
- strbuff->size - strbuff->length - size);
}
memcpy(strbuff->value + strbuff->length, data, size);
strbuff->length += size;
}
memcpy(strbuff->value + strbuff->length, data, size);
strbuff->length += size;
+ strbuff->value[strbuff->length] = '\0';
return 0;
}
return 0;
}
+
+char strbuffer_pop(strbuffer_t *strbuff)
+{
+ if(strbuff->length > 0) {
+ char c = strbuff->value[--strbuff->length];
+ strbuff->value[strbuff->length] = '\0';
+ return c;
+ }
+ else
+ return '\0';
+}