X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=include%2Fcstring.h;h=5e6c3f0679a77127447e51ef15ac0034960d6eb7;hb=9dec35aae55c1d122523458b0c92ec1eea16fbdc;hp=175cc0bbe4faaf0577b57317d658c2349909b9a3;hpb=c17330578022cc147543488615023bfb49c46ebe;p=smdp.git diff --git a/include/cstring.h b/include/cstring.h index 175cc0b..5e6c3f0 100644 --- a/include/cstring.h +++ b/include/cstring.h @@ -17,9 +17,6 @@ * */ -#include // strlen -#include // malloc, realloc - // The amount of memory allocated from heap when string expansion hits the // allocated memory limit #define REALLOC_ADD 10 @@ -34,50 +31,10 @@ typedef struct _cstring_t { 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->reset = cstring_reset; - 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_reset(cstring_t *self) { - free(self->text); - self->text = (void*)0; - self->size = self->alloc = 0; -} - -void cstring_delete(cstring_t *self) { - free(self->text); - free(self); -} - #endif // !defined( CSTRING_H )