diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2019-01-21 11:42:12 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2019-01-21 11:42:12 +0100 |
commit | 86f7e40446106f8365df4f52af4ec2ee5dcb37aa (patch) | |
tree | aa97d03d69e0e4ed51a3de7525d4370afac608c1 | |
parent | Rename all instances of string to strbuf. (diff) | |
download | calp-86f7e40446106f8365df4f52af4ec2ee5dcb37aa.tar.gz calp-86f7e40446106f8365df4f52af4ec2ee5dcb37aa.tar.xz |
Remove all explicit malloc's.
Diffstat (limited to '')
-rw-r--r-- | parse.c | 2 | ||||
-rw-r--r-- | strbuf.c | 20 | ||||
-rw-r--r-- | vcal.c | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -178,7 +178,7 @@ int handle_kv( return 3; } } else { - content_line* c = malloc(sizeof(*c)); + NEW(content_line, c); content_line_copy(c, cline); add_content_line (ev, c); } @@ -7,19 +7,19 @@ #define ERR(s) fprintf(stderr, "\x1B[0;31mERR\x1b[m (strbuf %3i): %s\n", __LINE__, s) #endif -int strbuf_init_0(strbuf* str) { - str->mem = NULL; - str->alloc = 0; - str->len = 0; - str->ptr = 0; +int CONSTRUCTOR_DECL(strbuf) { + this->mem = NULL; + this->alloc = 0; + this->len = 0; + this->ptr = 0; return 0; } -int strbuf_init_1(strbuf* str, size_t len) { - str->mem = malloc(len); - str->alloc = len; - str->ptr = 0; - str->len = 0; +int CONSTRUCTOR_DECL(strbuf, size_t len) { + this->mem = calloc(sizeof(*this->mem), len); + this->alloc = len; + this->ptr = 0; + this->len = 0; return 0; } @@ -95,8 +95,8 @@ int push_event(vcalendar* cal, vevent* ev) { } int CONSTRUCTOR_DECL(vcalendar) { - this->events = malloc(sizeof(*this->events)); this->alloc = 1; + this->events = calloc(sizeof(*this->events), this->alloc); this->n_events = 0; return 0; } |