diff options
author | Rosen Penev <rosenp@gmail.com> | 2017-11-07 12:22:09 -0800 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-11-13 09:39:11 +0100 |
commit | e7a63fbafdc6ec319bab616b43a642728f6b9c1c (patch) | |
tree | 58671ae64bc55ea51fac6d0a4790a29804064aea | |
parent | 2c0d9cfe05e9712d44622c6bb4558e97359bfb76 (diff) | |
download | ubox-e7a63fbafdc6ec319bab616b43a642728f6b9c1c.tar.gz |
ubox: Remove unnecessary memset calls.
Change to calloc instead. Less verbose.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
-rw-r--r-- | log/syslog.c | 4 | ||||
-rw-r--r-- | lsbloader.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/log/syslog.c b/log/syslog.c index af6530c..0e1f2a9 100644 --- a/log/syslog.c +++ b/log/syslog.c @@ -246,15 +246,13 @@ log_list(int count, struct log_head *h) int log_buffer_init(int size) { - struct log_head *_log = malloc(size); + struct log_head *_log = calloc(1, size); if (!_log) { fprintf(stderr, "Failed to initialize log buffer with size %d\n", log_size); return -1; } - memset(_log, 0, size); - if (log && ((log_size + sizeof(struct log_head)) < size)) { struct log_head *start = _log; struct log_head *end = ((void*) _log) + size; diff --git a/lsbloader.c b/lsbloader.c index b40a505..3d980c4 100644 --- a/lsbloader.c +++ b/lsbloader.c @@ -78,12 +78,11 @@ static int initd_parse(const char *file) } buffer[len] = '\0'; - i = malloc(sizeof(struct initd)); + i = calloc(1, sizeof(struct initd)); if (!i) { fprintf(stderr, "failed to alloc initd struct\n"); return -1; } - memset(i, 0, sizeof(*i)); if (!regexec(&pat_provides, buffer, 2, matches, 0)) i->name = strndup(buffer + matches[1].rm_so, (size_t)matches[1].rm_eo - matches[1].rm_so); |