From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Jul 2014 17:00:11 +0000 (+0200)
Subject: instance: allow filling "data" with fields of arbitrary type
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=562223169e7277237951f590ca0a2f32b112dcb1;p=oweals%2Fprocd.git

instance: allow filling "data" with fields of arbitrary type

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

diff --git a/service/instance.c b/service/instance.c
index a01a35a..1f85914 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -359,6 +359,15 @@ instance_file_update(struct blobmsg_list_node *l)
 	close(fd);
 }
 
+static void
+instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
+{
+	if (!cur)
+		return;
+
+	blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
+}
+
 static bool
 instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
 {
@@ -443,10 +452,9 @@ instance_config_parse(struct service_instance *in)
 			return false;
 	}
 
-	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
-		return false;
+	instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
 
-	if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
 		return false;
 
 	if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))