From 9c6ba382875dc4b3264a6363a2e0e63dbb2b95b9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 8 Dec 2021 20:07:28 +0100 Subject: treewide: adjust ubus object type names Drop the historically inherited "luci-rpc-" prefix and replace it with a more appropriate "rpcd-plugin-" string. Signed-off-by: Jo-Philipp Wich --- file.c | 2 +- iwinfo.c | 2 +- plugin.c | 2 +- session.c | 2 +- sys.c | 2 +- uci.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/file.c b/file.c index bd7af56..07b4d3c 100644 --- a/file.c +++ b/file.c @@ -996,7 +996,7 @@ rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) }; static struct ubus_object_type file_type = - UBUS_OBJECT_TYPE("luci-rpc-file", file_methods); + UBUS_OBJECT_TYPE("rpcd-plugin-file", file_methods); static struct ubus_object obj = { .name = "file", diff --git a/iwinfo.c b/iwinfo.c index ba4fc1e..6c0319e 100644 --- a/iwinfo.c +++ b/iwinfo.c @@ -975,7 +975,7 @@ rpc_iwinfo_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) }; static struct ubus_object_type iwinfo_type = - UBUS_OBJECT_TYPE("luci-rpc-iwinfo", iwinfo_methods); + UBUS_OBJECT_TYPE("rpcd-plugin-iwinfo", iwinfo_methods); static struct ubus_object obj = { .name = "iwinfo", diff --git a/plugin.c b/plugin.c index b0315dc..73b6c65 100644 --- a/plugin.c +++ b/plugin.c @@ -395,7 +395,7 @@ rpc_plugin_parse_exec(const char *name, int fd) return NULL; } - if (asprintf((char **)&obj_type->name, "luci-rpc-plugin-%s", name) < 0) { + if (asprintf((char **)&obj_type->name, "rpcd-plugin-exec-%s", name) < 0) { free(obj); free(obj_type); return NULL; diff --git a/session.c b/session.c index a11e3ab..c7d9f32 100644 --- a/session.c +++ b/session.c @@ -1332,7 +1332,7 @@ int rpc_session_api_init(struct ubus_context *ctx) }; static struct ubus_object_type session_type = - UBUS_OBJECT_TYPE("luci-rpc-session", session_methods); + UBUS_OBJECT_TYPE("rpcd-plugin-session", session_methods); static struct ubus_object obj = { .name = "session", diff --git a/sys.c b/sys.c index 69daa1b..097e705 100644 --- a/sys.c +++ b/sys.c @@ -355,7 +355,7 @@ rpc_sys_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) }; static struct ubus_object_type sys_type = - UBUS_OBJECT_TYPE("luci-rpc-sys", sys_methods); + UBUS_OBJECT_TYPE("rpcd-plugin-sys", sys_methods); static struct ubus_object obj = { .name = "rpc-sys", diff --git a/uci.c b/uci.c index e239433..3cd2b82 100644 --- a/uci.c +++ b/uci.c @@ -1778,7 +1778,7 @@ int rpc_uci_api_init(struct ubus_context *ctx) }; static struct ubus_object_type uci_type = - UBUS_OBJECT_TYPE("luci-rpc-uci", uci_methods); + UBUS_OBJECT_TYPE("rpcd-plugin-uci", uci_methods); static struct ubus_object obj = { .name = "uci", -- cgit v1.2.1