service: make instance_update() void and unconditionally replace config on update

[project/procd.git] / service / service.c

diff --git a/service/service.c b/service/service.c
index 2702dc3..95978b5 100644 (file)
--- a/service/service.c
+++ b/service/service.c
@@ -22,7 +22,7 @@
 
 #include "../rcS.h"
 
-struct avl_tree services;
+AVL_TREE(services, avl_strcmp, false, NULL);
 static struct blob_buf b;
 static struct ubus_context *ctx;
 
@@ -363,7 +363,7 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
 
        blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
-       cur = tb[SERVICE_ATTR_NAME];
+       cur = tb[SERVICE_SET_NAME];
        if (!cur)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -552,11 +552,3 @@ void ubus_init_service(struct ubus_context *_ctx)
        ctx = _ctx;
        ubus_add_object(ctx, &main_object);
 }
-
-void
-service_init(void)
-{
-       avl_init(&services, avl_strcmp, false, NULL);
-       service_validate_init();
-}
-