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 <jo@mein.io>
This commit is contained in:
parent
75a96dc281
commit
9c6ba38287
6 changed files with 6 additions and 6 deletions
2
file.c
2
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",
|
||||
|
|
2
iwinfo.c
2
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",
|
||||
|
|
2
plugin.c
2
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;
|
||||
|
|
|
@ -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",
|
||||
|
|
2
sys.c
2
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",
|
||||
|
|
2
uci.c
2
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",
|
||||
|
|
Loading…
Reference in a new issue