rename a few functions in preparation for renaming script_data to node_info

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

diff --git a/event.c b/event.c
index ba0d8adf980d1d5611fb14bd664d5d0c414de1de..0f8033cb568a429e2ba40fc9c6499b746ce9fd73 100644 (file)
--- a/event.c
+++ b/event.c
@@ -52,7 +52,7 @@ static const char * const uev_select_reason[] = {
 };
 
 static void
-usteer_event_add_node_info(struct usteer_node *node)
+usteer_event_add_node_status(struct usteer_node *node)
 {
        blobmsg_add_u32(&b, "load", node->load);
        blobmsg_add_u32(&b, "assoc", node->n_assoc);
@@ -102,7 +102,7 @@ usteer_event_send_ubus(struct uevent *ev)
 
        if (ev->node_cur) {
                c = blobmsg_open_table(&b, "local");
-               usteer_event_add_node_info(ev->node_cur);
+               usteer_event_add_node_status(ev->node_cur);
                blobmsg_close_table(&b, c);
        }
 
@@ -111,7 +111,7 @@ usteer_event_send_ubus(struct uevent *ev)
                blobmsg_add_string(&b, "name", usteer_node_name(ev->node_other));
                if (ev->si_other)
                        blobmsg_add_u32(&b, "signal", (int32_t)ev->si_other->signal);
-               usteer_event_add_node_info(ev->node_other);
+               usteer_event_add_node_status(ev->node_other);
                blobmsg_close_table(&b, c);
        }
 

diff --git a/ubus.c b/ubus.c
index 7abc7dc15443e5b7ec6cb2af0686182bf9017570..f23b9f5cbaa31118f2a68f9a1132a0f8f358231a 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -267,7 +267,7 @@ usteer_ubus_set_config(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static void
-usteer_dump_node_info(struct usteer_node *node)
+usteer_dump_node(struct usteer_node *node)
 {
        void *c;
 
@@ -299,7 +299,7 @@ usteer_ubus_local_info(struct ubus_context *ctx, struct ubus_object *obj,
        blob_buf_init(&b, 0);
 
        for_each_local_node(node)
-               usteer_dump_node_info(node);
+               usteer_dump_node(node);
 
        ubus_send_reply(ctx, req, b.head);
 
@@ -316,7 +316,7 @@ usteer_ubus_remote_info(struct ubus_context *ctx, struct ubus_object *obj,
        blob_buf_init(&b, 0);
 
        avl_for_each_element(&remote_nodes, rn, avl)
-               usteer_dump_node_info(&rn->node);
+               usteer_dump_node(&rn->node);
 
        ubus_send_reply(ctx, req, b.head);