Rename all instances of string to strbuf.

1 files changed, 18 insertions, 16 deletions

diff --git a/strbuf.c b/strbuf.c
index f6aad92a..932b31e0 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -2,10 +2,12 @@
 
 #include <string.h>
 
+#ifdef SAFE_STR
 #include <stdio.h>
 #define ERR(s) fprintf(stderr, "\x1B[0;31mERR\x1b[m (strbuf %3i): %s\n", __LINE__, s)
+#endif
 
-int strbuf_init_0(string* str) {
+int strbuf_init_0(strbuf* str) {
 	str->mem   = NULL;
 	str->alloc = 0;
 	str->len   = 0;
@@ -13,7 +15,7 @@ int strbuf_init_0(string* str) {
 	return 0;
 }
 
-int strbuf_init_1(string* str, size_t len) {
+int strbuf_init_1(strbuf* str, size_t len) {
 	str->mem = malloc(len);
 	str->alloc = len;
 	str->ptr = 0;
@@ -21,7 +23,7 @@ int strbuf_init_1(string* str, size_t len) {
 	return 0;
 }
 
-int realloc_string(string* str, size_t len) {
+int strbuf_realloc(strbuf* str, size_t len) {
 #ifdef SAFE_STR
 	if (str->mem == NULL || str->alloc == 0) {
 		ERR("String memory not initialized");
@@ -33,7 +35,7 @@ int realloc_string(string* str, size_t len) {
 	return 0;
 }
 
-int free_string(string* str) {
+int strbuf_free(strbuf* str) {
 #ifdef SAFE_STR
 	if (str->alloc == 0 || str->mem == NULL) {
 		ERR("String not allocated");
@@ -45,18 +47,18 @@ int free_string(string* str) {
 	return 0;
 }
 
-int strbuf_append(string* s, char c) {
+int strbuf_append(strbuf* s, char c) {
 	s->mem[s->len] = c;
 	s->ptr = ++s->len;
 	return 0;
 }
 
-int strbuf_cap(string* s) {
+int strbuf_cap(strbuf* s) {
 	return strbuf_append(s, 0);
 }
 
 
-int copy_strbuf(string* dest, string* src) {
+int strbuf_copy(strbuf* dest, strbuf* src) {
 #ifdef SAFE_STR
 	if (dest->alloc < src->len) {
 		ERR("Not enough memmory allocated");
@@ -68,15 +70,15 @@ int copy_strbuf(string* dest, string* src) {
 	return 0;
 }
 
-int strbuf_cmp(string* a, string* b) {
+int strbuf_cmp(strbuf* a, strbuf* b) {
 	return strcmp(a->mem, b->mem);
 }
 
-int strbuf_c(string* a, char* b) {
+int strbuf_c(strbuf* a, char* b) {
 	return strcmp(a->mem, b) == 0;
 }
 
-char* charat(string* s, int idx) {
+char* charat(strbuf* s, int idx) {
 #ifdef SAFE_STR
 	if (idx > s->len) {
 		ERR("Index out of bounds");
@@ -86,17 +88,17 @@ char* charat(string* s, int idx) {
 	return &s->mem[idx];
 }
 
-char* strbuf_cur(string* s) {
+char* strbuf_cur(strbuf* s) {
 	return &s->mem[s->ptr];
 }
 
-int strbuf_reset(string* s)
+int strbuf_reset(strbuf* s)
 {
 	s->ptr = 0;
 	return 0;
 }
 
-int strbuf_init_copy(string* dest, string* src) {
+int strbuf_init_copy(strbuf* dest, strbuf* src) {
 #ifdef SAFE_STR
 	if (dest->alloc != 0) {
 		ERR("Dest already allocated");
@@ -105,16 +107,16 @@ int strbuf_init_copy(string* dest, string* src) {
 #endif
 
 	strbuf_init_1(dest, src->len + 1);
-	copy_strbuf(dest, src);
+	strbuf_copy(dest, src);
 
 	return 0;
 }
 
-char* strbuf_end(string* s) {
+char* strbuf_end(strbuf* s) {
 	return &s->mem[s->len];
 }
 
-int strbuf_soft_reset(string* s) {
+int strbuf_soft_reset(strbuf* s) {
 	s->ptr = s->len = 0;
 	return 0;
 }