Browse Source

ubox: Remove unnecessary memset calls.

Change to calloc instead. Less verbose.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Rosen Penev 6 years ago
parent
commit
e7a63fbafd
2 changed files with 2 additions and 5 deletions
  1. 1 3
      log/syslog.c
  2. 1 2
      lsbloader.c

+ 1 - 3
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;

+ 1 - 2
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);