nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-web: clean up malloc() calls

Browse Source
This commit is contained in:
Matthias Schiffer 2018-02-22 14:11:06 +01:00
parent f957593f26
commit 94f22e50e6
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/gluon-web/src/template_lmo.c
View File

@ -80,9 +80,7 @@ static lmo_archive_t * lmo_open(const char *file)
if ((in = open(file, O_RDONLY)) == -1) if ((in = open(file, O_RDONLY)) == -1)
goto err; goto err;
if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL) if ((ar = calloc(1, sizeof(*ar))) != NULL) {
{
memset(ar, 0, sizeof(*ar));
ar->fd = in; ar->fd = in;
ar->size = s.st_size; ar->size = s.st_size;
@ -140,11 +138,9 @@ int lmo_load_catalog(const char *lang, const char *dir)
if (!dir || !(dh = opendir(dir))) if (!dir || !(dh = opendir(dir)))
goto err; goto err;
if (!(cat = malloc(sizeof(*cat)))) if (!(cat = calloc(1, sizeof(*cat))))
goto err; goto err;
memset(cat, 0, sizeof(*cat));
snprintf(cat->lang, sizeof(cat->lang), "%s", lang); snprintf(cat->lang, sizeof(cat->lang), "%s", lang);
snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang); snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang);

6
package/gluon-web/src/template_parser.c
View File

@ -39,10 +39,9 @@ struct template_parser * template_open(const char *file)
struct stat s; struct stat s;
struct template_parser *parser; struct template_parser *parser;
if (!(parser = malloc(sizeof(*parser)))) if (!(parser = calloc(1, sizeof(*parser))))
goto err; goto err;
memset(parser, 0, sizeof(*parser));
parser->fd = -1; parser->fd = -1;
parser->file = file; parser->file = file;
@ -80,10 +79,9 @@ struct template_parser * template_string(const char *str, uint32_t len)
return NULL; return NULL;
} }
if (!(parser = malloc(sizeof(*parser)))) if (!(parser = calloc(1, sizeof(*parser))))
goto err; goto err;
memset(parser, 0, sizeof(*parser));
parser->fd = -1; parser->fd = -1;
parser->size = len; parser->size = len;

2
package/gluon-web/src/template_utils.c
View File

@ -27,7 +27,7 @@ struct template_buffer * buf_init(int size)
if (size <= 0) if (size <= 0)
size = 1024; size = 1024;
buf = (struct template_buffer *)malloc(sizeof(struct template_buffer)); buf = malloc(sizeof(*buf));
if (buf != NULL) if (buf != NULL)
{ {