Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-24 09:14:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove effectively duplicate parameter.

Browse Source
This commit is contained in:
Roger A. Light
2023-03-23 12:10:00 +00:00
parent 3fd5ba5f18
commit 910b8e2c1d
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/control_common.c
+3 -3
View File
@@ -47,7 +47,7 @@ void control__send_response(cJSON *tree, const char *topic)
}
static int control__generic_handle_commands(struct control_cmd *cmd, struct mosquitto *context, cJSON *commands, void *userdata, int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata))
static int control__generic_handle_commands(struct control_cmd *cmd, struct mosquitto *context, cJSON *commands, void *userdata, int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, void *userdata))
{
cJSON *aiter;
char *command;
@@ -65,7 +65,7 @@ static int control__generic_handle_commands(struct control_cmd *cmd, struct mosq
return MOSQ_ERR_INVAL;
}
cmd_cb(cmd, context, command, userdata);
cmd_cb(cmd, context, userdata);
}else{
control__command_reply(cmd, "Missing command");
return MOSQ_ERR_INVAL;
@@ -79,7 +79,7 @@ static int control__generic_handle_commands(struct control_cmd *cmd, struct mosq
}
int control__generic_control_callback(struct mosquitto_evt_control *event_data, const char *response_topic, void *userdata,
int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata))
int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, void *userdata))
{
struct mosquitto_evt_control *ed = event_data;
common/control_common.h
+1 -1
View File
@@ -14,6 +14,6 @@ struct control_cmd{
void control__command_reply(struct control_cmd *cmd, const char *error);
void control__send_response(cJSON *tree, const char* topic);
int control__generic_control_callback(struct mosquitto_evt_control *event_data, const char *response_topic, void *userdata,
int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata));
int (*cmd_cb)(struct control_cmd *cmd, struct mosquitto *context, void *userdata));
#endif
plugins/dynamic-security/control.c
+32 -32
View File
@@ -35,79 +35,79 @@ Contributors:
#define RESPONSE_TOPIC "$CONTROL/dynamic-security/v1/response"
static int dynsec__handle_command(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata)
static int dynsec__handle_command(struct control_cmd *cmd, struct mosquitto *context, void *userdata)
{
struct dynsec__data *data = userdata;
int rc = MOSQ_ERR_SUCCESS;
/* Plugin */
if(!strcasecmp(command, "setDefaultACLAccess")){
if(!strcasecmp(cmd->command_name, "setDefaultACLAccess")){
rc = dynsec__process_set_default_acl_access(data, cmd, context);
}else if(!strcasecmp(command, "getDefaultACLAccess")){
}else if(!strcasecmp(cmd->command_name, "getDefaultACLAccess")){
rc = dynsec__process_get_default_acl_access(data, cmd, context);
/* Clients */
}else if(!strcasecmp(command, "createClient")){
}else if(!strcasecmp(cmd->command_name, "createClient")){
rc = dynsec_clients__process_create(data, cmd, context);
}else if(!strcasecmp(command, "deleteClient")){
}else if(!strcasecmp(cmd->command_name, "deleteClient")){
rc = dynsec_clients__process_delete(data, cmd, context);
}else if(!strcasecmp(command, "getClient")){
}else if(!strcasecmp(cmd->command_name, "getClient")){
rc = dynsec_clients__process_get(data, cmd, context);
}else if(!strcasecmp(command, "listClients")){
}else if(!strcasecmp(cmd->command_name, "listClients")){
rc = dynsec_clients__process_list(data, cmd, context);
}else if(!strcasecmp(command, "modifyClient")){
}else if(!strcasecmp(cmd->command_name, "modifyClient")){
rc = dynsec_clients__process_modify(data, cmd, context);
}else if(!strcasecmp(command, "setClientPassword")){
}else if(!strcasecmp(cmd->command_name, "setClientPassword")){
rc = dynsec_clients__process_set_password(data, cmd, context);
}else if(!strcasecmp(command, "setClientId")){
}else if(!strcasecmp(cmd->command_name, "setClientId")){
rc = dynsec_clients__process_set_id(data, cmd, context);
}else if(!strcasecmp(command, "addClientRole")){
}else if(!strcasecmp(cmd->command_name, "addClientRole")){
rc = dynsec_clients__process_add_role(data, cmd, context);
}else if(!strcasecmp(command, "removeClientRole")){
}else if(!strcasecmp(cmd->command_name, "removeClientRole")){
rc = dynsec_clients__process_remove_role(data, cmd, context);
}else if(!strcasecmp(command, "enableClient")){
}else if(!strcasecmp(cmd->command_name, "enableClient")){
rc = dynsec_clients__process_enable(data, cmd, context);
}else if(!strcasecmp(command, "disableClient")){
}else if(!strcasecmp(cmd->command_name, "disableClient")){
rc = dynsec_clients__process_disable(data, cmd, context);
/* Groups */
}else if(!strcasecmp(command, "addGroupClient")){
}else if(!strcasecmp(cmd->command_name, "addGroupClient")){
rc = dynsec_groups__process_add_client(data, cmd, context);
}else if(!strcasecmp(command, "createGroup")){
}else if(!strcasecmp(cmd->command_name, "createGroup")){
rc = dynsec_groups__process_create(data, cmd, context);
}else if(!strcasecmp(command, "deleteGroup")){
}else if(!strcasecmp(cmd->command_name, "deleteGroup")){
rc = dynsec_groups__process_delete(data, cmd, context);
}else if(!strcasecmp(command, "getGroup")){
}else if(!strcasecmp(cmd->command_name, "getGroup")){
rc = dynsec_groups__process_get(data, cmd, context);
}else if(!strcasecmp(command, "listGroups")){
}else if(!strcasecmp(cmd->command_name, "listGroups")){
rc = dynsec_groups__process_list(data, cmd, context);
}else if(!strcasecmp(command, "modifyGroup")){
}else if(!strcasecmp(cmd->command_name, "modifyGroup")){
rc = dynsec_groups__process_modify(data, cmd, context);
}else if(!strcasecmp(command, "removeGroupClient")){
}else if(!strcasecmp(cmd->command_name, "removeGroupClient")){
rc = dynsec_groups__process_remove_client(data, cmd, context);
}else if(!strcasecmp(command, "addGroupRole")){
}else if(!strcasecmp(cmd->command_name, "addGroupRole")){
rc = dynsec_groups__process_add_role(data, cmd, context);
}else if(!strcasecmp(command, "removeGroupRole")){
}else if(!strcasecmp(cmd->command_name, "removeGroupRole")){
rc = dynsec_groups__process_remove_role(data, cmd, context);
}else if(!strcasecmp(command, "setAnonymousGroup")){
}else if(!strcasecmp(cmd->command_name, "setAnonymousGroup")){
rc = dynsec_groups__process_set_anonymous_group(data, cmd, context);
}else if(!strcasecmp(command, "getAnonymousGroup")){
}else if(!strcasecmp(cmd->command_name, "getAnonymousGroup")){
rc = dynsec_groups__process_get_anonymous_group(data, cmd, context);
/* Roles */
}else if(!strcasecmp(command, "createRole")){
}else if(!strcasecmp(cmd->command_name, "createRole")){
rc = dynsec_roles__process_create(data, cmd, context);
}else if(!strcasecmp(command, "getRole")){
}else if(!strcasecmp(cmd->command_name, "getRole")){
rc = dynsec_roles__process_get(data, cmd, context);
}else if(!strcasecmp(command, "listRoles")){
}else if(!strcasecmp(cmd->command_name, "listRoles")){
rc = dynsec_roles__process_list(data, cmd, context);
}else if(!strcasecmp(command, "modifyRole")){
}else if(!strcasecmp(cmd->command_name, "modifyRole")){
rc = dynsec_roles__process_modify(data, cmd, context);
}else if(!strcasecmp(command, "deleteRole")){
}else if(!strcasecmp(cmd->command_name, "deleteRole")){
rc = dynsec_roles__process_delete(data, cmd, context);
}else if(!strcasecmp(command, "addRoleACL")){
}else if(!strcasecmp(cmd->command_name, "addRoleACL")){
rc = dynsec_roles__process_add_acl(data, cmd, context);
}else if(!strcasecmp(command, "removeRoleACL")){
}else if(!strcasecmp(cmd->command_name, "removeRoleACL")){
rc = dynsec_roles__process_remove_acl(data, cmd, context);
/* Unknown */
src/broker_control.c
+4 -4
View File
@@ -39,7 +39,7 @@ Contributors:
static mosquitto_plugin_id_t plg_id;
static int broker__handle_control(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata);
static int broker__handle_control(struct control_cmd *cmd, struct mosquitto *context, void *userdata);
static int add_plugin_info(cJSON *j_plugins, mosquitto_plugin_id_t *pid)
{
@@ -252,15 +252,15 @@ void broker_control__reload(void)
* #
* ################################################################ */
static int broker__handle_control(struct control_cmd *cmd, struct mosquitto *context, const char *command, void *userdata)
static int broker__handle_control(struct control_cmd *cmd, struct mosquitto *context, void *userdata)
{
int rc = MOSQ_ERR_SUCCESS;
UNUSED(userdata);
if(!strcasecmp(command, "listPlugins")){
if(!strcasecmp(cmd->command_name, "listPlugins")){
rc = broker__process_list_plugins(cmd, context);
}else if(!strcasecmp(command, "listListeners")){
}else if(!strcasecmp(cmd->command_name, "listListeners")){
rc = broker__process_list_listeners(cmd, context);
/* Unknown */