From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 31 Dec 2012 15:18:32 +0000 (+0100)
Subject: use calloc_a
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=38d78cba6ed4b42b0c1134bf05885d7e09537fde;p=oweals%2Fprocd.git

use calloc_a

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/procd.h b/procd.h
index 6461be6..66a08e2 100644
--- a/procd.h
+++ b/procd.h
@@ -2,6 +2,7 @@
 #define __PROCD_H
 
 #include <libubox/uloop.h>
+#include <libubox/utils.h>
 #include <libubus.h>
 #include <stdio.h>
 
diff --git a/service.c b/service.c
index 8dbb1e6..44b10be 100644
--- a/service.c
+++ b/service.c
@@ -54,9 +54,7 @@ service_alloc(const char *name)
 	struct service *s;
 	char *new_name;
 
-	s = calloc(1, sizeof(*s) + strlen(name) + 1);
-
-	new_name = (char *) (s + 1);
+	s = calloc_a(sizeof(*s), &new_name, strlen(name) + 1);
 	strcpy(new_name, name);
 
 	vlist_init(&s->instances, avl_strcmp, service_instance_update);