X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcstring.h;h=5e6c3f0679a77127447e51ef15ac0034960d6eb7;hb=f7c44aadc65ba6401992ec02f7ccb1ea4c2301ff;hp=b87bc8d4d56ae8a8dd94dbd6466ea7628adb2f41;hpb=71843db5886f60d3959d966a5e062a516c24798e;p=smdp.git

diff --git a/include/cstring.h b/include/cstring.h
index b87bc8d..5e6c3f0 100644
--- a/include/cstring.h
+++ b/include/cstring.h
@@ -17,9 +17,6 @@
  *
  */
 
-#include <string.h> // strlen
-#include <stdlib.h> // malloc, realloc
-
 // The amount of memory allocated from heap when string expansion hits the
 // allocated memory limit
 #define REALLOC_ADD 10
@@ -30,46 +27,14 @@ typedef struct _cstring_t {
     size_t alloc;
     void (*expand)(struct _cstring_t *self, char x);
     void (*expand_arr)(struct _cstring_t *self, char *x);
+    void (*reset)(struct _cstring_t *self);
     void (*delete)(struct _cstring_t *self);
 } cstring_t;
 
+cstring_t *cstring_init();
 void cstring_expand(cstring_t *self, char x);
 void cstring_expand_arr(cstring_t *self, char *x);
+void cstring_reset(cstring_t *self);
 void cstring_delete(cstring_t *self);
 
-cstring_t *cstring_init() {
-    cstring_t *x = malloc(sizeof(cstring_t));
-    x->text = (void*)0;
-    x->size = x->alloc = 0;
-    x->expand = cstring_expand;
-    x->expand_arr = cstring_expand_arr;
-    x->delete = cstring_delete;
-    return x;
-}
-
-void cstring_expand(cstring_t *self, char x) {
-    if(self->size + sizeof(x) + sizeof(char) > self->alloc) {
-        self->alloc += (REALLOC_ADD * sizeof(char));
-        self->text = realloc(self->text, self->alloc);
-    }
-    self->text[self->size] = x;
-    self->text[self->size+1] = '\0';
-    self->size = strlen(self->text);
-}
-
-void cstring_expand_arr(cstring_t *self, char *x) {
-    if(self->size + strlen(x) + sizeof(char) > self->alloc) {
-        self->alloc += (REALLOC_ADD * sizeof(char));
-        self->text = realloc(self->text, self->alloc);
-    }
-    self->text = strcat(self->text, x);
-    self->size = strlen(self->text);
-}
-
-
-void cstring_delete(cstring_t *self) {
-    free(self->text);
-    free(self);
-}
-
 #endif // !defined( CSTRING_H )