diff --git a/file.c b/file.c index 57e0894..d22add5 100644 --- a/file.c +++ b/file.c @@ -87,7 +87,7 @@ enum { }; static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = { - [RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING }, + [RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING }, [RPC_E_PARM] = { .name = "params", .type = BLOBMSG_TYPE_ARRAY }, [RPC_E_ENV] = { .name = "env", .type = BLOBMSG_TYPE_TABLE }, }; @@ -457,7 +457,7 @@ rpc_file_exec_epipe_state_cb(struct ustream *s) static int rpc_file_exec_run(const char *cmd, - const struct blob_attr *arg, const struct blob_attr *env, + const struct blob_attr *arg, const struct blob_attr *env, struct ubus_context *ctx, struct ubus_request_data *req) { pid_t pid; @@ -580,7 +580,7 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj, return UBUS_STATUS_INVALID_ARGUMENT; return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]), - tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req); + tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req); } diff --git a/include/rpcd/plugin.h b/include/rpcd/plugin.h index ac4bf55..f30433d 100644 --- a/include/rpcd/plugin.h +++ b/include/rpcd/plugin.h @@ -38,10 +38,10 @@ #include /* location of plugin executables */ -#define RPC_PLUGIN_DIRECTORY "/usr/libexec/rpcd" +#define RPC_PLUGIN_DIRECTORY "/usr/libexec/rpcd" /* location of plugin libraries */ -#define RPC_LIBRARY_DIRECTORY "/usr/lib/rpcd" +#define RPC_LIBRARY_DIRECTORY "/usr/lib/rpcd" struct rpc_daemon_ops { bool (*session_access)(const char *sid, const char *scope, diff --git a/iwinfo.c b/iwinfo.c index 334fbce..78c48e8 100644 --- a/iwinfo.c +++ b/iwinfo.c @@ -381,14 +381,14 @@ rpc_iwinfo_assoclist(struct ubus_context *ctx, struct ubus_object *obj, e = blobmsg_open_table(&buf, "rx"); blobmsg_add_u32(&buf, "rate", a->rx_rate.rate); - blobmsg_add_u32(&buf, "mcs", a->rx_rate.mcs); + blobmsg_add_u32(&buf, "mcs", a->rx_rate.mcs); blobmsg_add_u8(&buf, "40mhz", a->rx_rate.is_40mhz); blobmsg_add_u8(&buf, "short_gi", a->rx_rate.is_short_gi); blobmsg_close_table(&buf, e); e = blobmsg_open_table(&buf, "tx"); blobmsg_add_u32(&buf, "rate", a->tx_rate.rate); - blobmsg_add_u32(&buf, "mcs", a->tx_rate.mcs); + blobmsg_add_u32(&buf, "mcs", a->tx_rate.mcs); blobmsg_add_u8(&buf, "40mhz", a->tx_rate.is_40mhz); blobmsg_add_u8(&buf, "short_gi", a->tx_rate.is_short_gi); blobmsg_close_table(&buf, e);