DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: adjust ubus object type names

Browse source 
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:
Jo-Philipp Wich 2021-12-08 20:07:28 +01:00
parent 75a96dc281
commit 9c6ba38287
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
file.c
View file

@ -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 = 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 = { static struct ubus_object obj = {
.name = "file", .name = "file",

2
iwinfo.c
View file

@ -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 = 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 = { static struct ubus_object obj = {
.name = "iwinfo", .name = "iwinfo",

2
plugin.c
View file

@ -395,7 +395,7 @@ rpc_plugin_parse_exec(const char *name, int fd)
return NULL; 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);
free(obj_type); free(obj_type);
return NULL; return NULL;

2
session.c
View file

@ -1332,7 +1332,7 @@ int rpc_session_api_init(struct ubus_context *ctx)
}; };
static struct ubus_object_type session_type = 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 = { static struct ubus_object obj = {
.name = "session", .name = "session",

2
sys.c
View file

@ -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 = 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 = { static struct ubus_object obj = {
.name = "rpc-sys", .name = "rpc-sys",

2
uci.c
View file

@ -1778,7 +1778,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
}; };
static struct ubus_object_type uci_type = 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 = { static struct ubus_object obj = {
.name = "uci", .name = "uci",