mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2025-12-10 07:44:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Omar Kallel 2020-10-02 11:31:38 +01:00 • committed by Amin Ben Ramdhane
parent 4d67ae68e0
commit 4ff0c1938a
6 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
backupSession.c
View file

@ -850,7 +850,7 @@ void load_queue_event(mxml_node_t *tree,struct cwmp *cwmp)
}
}
void load_schedule_inform(mxml_node_t *tree,struct cwmp *cwmp)
void load_schedule_inform(mxml_node_t *tree)
{
char *command_key = NULL;
mxml_node_t *b = tree, *c;
@ -904,7 +904,7 @@ void load_schedule_inform(mxml_node_t *tree,struct cwmp *cwmp)
}
}
void load_download(mxml_node_t *tree,struct cwmp *cwmp)
void load_download(mxml_node_t *tree)
{
mxml_node_t *b = tree, *c;
struct download *download_request = NULL;
@ -1010,7 +1010,7 @@ void load_download(mxml_node_t *tree,struct cwmp *cwmp)
count_download_queue++;
}
void load_schedule_download(mxml_node_t *tree,struct cwmp *cwmp)
void load_schedule_download(mxml_node_t *tree)
{
mxml_node_t *b = tree, *c;
struct schedule_download *download_request = NULL;
@ -1216,7 +1216,7 @@ void load_schedule_download(mxml_node_t *tree,struct cwmp *cwmp)
}
void load_apply_schedule_download(mxml_node_t *tree,struct cwmp *cwmp)
void load_apply_schedule_download(mxml_node_t *tree)
{
mxml_node_t *b = tree, *c;
struct apply_schedule_download *download_request = NULL;
@ -1340,7 +1340,7 @@ void load_apply_schedule_download(mxml_node_t *tree,struct cwmp *cwmp)
if(download_request->timeintervals[0].windowstart != 0)
count_download_queue++;
}
void load_upload(mxml_node_t *tree,struct cwmp *cwmp)
void load_upload(mxml_node_t *tree)
{
mxml_node_t *b = tree, *c;
struct upload *upload_request = NULL;
@ -1435,7 +1435,7 @@ void load_upload(mxml_node_t *tree,struct cwmp *cwmp)
count_download_queue++;
}
void load_change_du_state(mxml_node_t *tree,struct cwmp *cwmp)
void load_change_du_state(mxml_node_t *tree)
{
mxml_node_t *b = tree, *c, *d;
struct change_du_state *change_du_state_request = NULL;
@ -2030,11 +2030,11 @@ int cwmp_load_saved_session(struct cwmp *cwmp, char **ret, enum backup_loading l
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "download") == 0)
{
load_download(b,cwmp);
load_download(b);
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "upload") == 0)
{
load_upload(b,cwmp);
load_upload(b);
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "transfer_complete") == 0)
{
@ -2042,11 +2042,11 @@ int cwmp_load_saved_session(struct cwmp *cwmp, char **ret, enum backup_loading l
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "schedule_inform") == 0)
{
load_schedule_inform(b,cwmp);
load_schedule_inform(b);
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "change_du_state") == 0)
{
load_change_du_state(b,cwmp);
load_change_du_state(b);
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "du_state_change_complete") == 0)
{
@ -2054,11 +2054,11 @@ int cwmp_load_saved_session(struct cwmp *cwmp, char **ret, enum backup_loading l
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "schedule_download") == 0)
{
load_schedule_download(b,cwmp);
load_schedule_download(b);
}
else if(b->type == MXML_ELEMENT && strcmp(b->value.element.name, "apply_schedule_download") == 0)
{
load_apply_schedule_download(b,cwmp);
load_apply_schedule_download(b);
}
}
b = mxmlWalkNext(b, bkp_tree, MXML_NO_DESCEND);

2
config.c
View file

@ -1168,7 +1168,7 @@ int cwmp_get_deviceid(struct cwmp *cwmp) {
cwmp->deviceid.productclass = strdup(get_deviceid_productclass());
cwmp->deviceid.oui = strdup(get_deviceid_manufactureroui());
cwmp->deviceid.softwareversion = strdup(get_softwareversion());
cwmp_dm_ctx_clean(cwmp, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return CWMP_OK;
}

18
cwmp.c
View file

@ -38,7 +38,7 @@ int cwmp_dm_ctx_init(struct cwmp *cwmp, struct dmctx *ctx)
return 0;
}
int cwmp_dm_ctx_clean(struct cwmp *cwmp, struct dmctx *ctx)
int cwmp_dm_ctx_clean(struct dmctx *ctx)
{
dm_ctx_clean(ctx);
return 0;
@ -134,7 +134,7 @@ int cwmp_get_retry_interval (struct cwmp *cwmp)
return (retry_count);
}
static void cwmp_prepare_value_change (struct cwmp *cwmp, struct session *session)
static void cwmp_prepare_value_change (struct cwmp *cwmp)
{
struct event_container *event_container;
if (list_value_change.next == &(list_value_change))
@ -179,7 +179,7 @@ void cwmp_schedule_session (struct cwmp *cwmp)
if( access( DM_ENABLED_NOTIFY, F_OK ) != -1 )
check_value_change();
dmbbf_update_enabled_notify_file(DM_CWMP, cwmp->conf.amd_version, cwmp->conf.instance_mode);
cwmp_prepare_value_change(cwmp, session);
cwmp_prepare_value_change(cwmp);
//free_dm_parameter_all_fromlist(&list_value_change);
if ((error = cwmp_move_session_to_session_send (cwmp, session))) {
CWMP_LOG(EMERG,"FATAL error in the mutex process in the session scheduler!");
@ -205,7 +205,7 @@ void cwmp_schedule_session (struct cwmp *cwmp)
CWMP_LOG (INFO,"End session");
if (session->error == CWMP_RETRY_SESSION && (!list_empty(&(session->head_event_container)) || (list_empty(&(session->head_event_container)) && cwmp->cwmp_cr_event == 0)) )
{
run_session_end_func(session);
run_session_end_func();
error = cwmp_move_session_to_session_queue (cwmp, session);
CWMP_LOG(INFO,"Retry session, retry count = %d, retry in %ds",cwmp->retry_count_session,cwmp_get_retry_interval(cwmp));
retry = true;
@ -217,8 +217,8 @@ void cwmp_schedule_session (struct cwmp *cwmp)
continue;
}
event_remove_all_event_container(session,RPC_SEND);
run_session_end_func(session);
cwmp_session_destructor (cwmp, session);
run_session_end_func();
cwmp_session_destructor (session);
cwmp->session_send = NULL;
cwmp->retry_count_session = 0;
cwmp->session_status.last_end_time = time(NULL);
@ -448,12 +448,12 @@ int cwmp_move_session_to_session_queue (struct cwmp *cwmp, struct session *sessi
list_del(&(rpc_acs->list));
list_add_tail (&(rpc_acs->list), &(session_queue->head_rpc_acs));
}
cwmp_session_destructor (cwmp, session);
cwmp_session_destructor (session);
pthread_mutex_unlock (&(cwmp->mutex_session_queue));
return CWMP_OK;
}
int cwmp_session_destructor (struct cwmp *cwmp, struct session *session)
int cwmp_session_destructor (struct session *session)
{
struct rpc *rpc;
@ -498,7 +498,7 @@ struct session *cwmp_add_queue_session (struct cwmp *cwmp)
return session;
}
int run_session_end_func (struct session *session)
int run_session_end_func ()
{
apply_end_session();

6
event.c
View file

@ -302,7 +302,7 @@ void check_value_change(void)
dmjson_get_string("notification", &jval);
notification = strdup(jval);
dmjson_parse_fini();
fault = dmentry_get_parameter_leaf_value(&dmctx, CMD_GET_VALUE, parameter);
fault = dmentry_get_parameter_leaf_value(&dmctx, parameter);
if (!fault && dmctx.list_parameter.next != &dmctx.list_parameter) {
dm_parameter = list_entry(dmctx.list_parameter.next, struct dm_parameter, list);
if (strcmp(dm_parameter->data, value) != 0 && notification[0] == '1')
@ -312,7 +312,7 @@ void check_value_change(void)
FREE(notification);
FREE(parameter);
}
cwmp_dm_ctx_clean(cwmp, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
fclose(fp);
}
@ -394,7 +394,7 @@ void cwmp_add_notification(void)
}
dm_ctx_clean_sub(&dmctx);
}
cwmp_dm_ctx_clean(cwmp, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
if (lw_isactive) {
cwmp_lwnotification();
}

6
inc/cwmp.h
View file

@ -311,13 +311,13 @@ void *thread_handle_notify(void *v);
int zlib_compress (char *message, unsigned char **zmsg, int *zlen, int type);
int cwmp_get_int_event_code(char *code);
int cwmp_dm_ctx_init(struct cwmp *cwmp, struct dmctx *ctx);
int cwmp_dm_ctx_clean(struct cwmp *cwmp, struct dmctx *ctx);
int cwmp_dm_ctx_clean(struct dmctx *ctx);
int cwmp_apply_acs_changes();
int cwmp_move_session_to_session_send (struct cwmp *cwmp, struct session *session);
int cwmp_schedule_rpc (struct cwmp *cwmp, struct session *session);
int run_session_end_func (struct session *session);
int run_session_end_func ();
int cwmp_move_session_to_session_queue (struct cwmp *cwmp, struct session *session);
int cwmp_session_destructor (struct cwmp *cwmp, struct session *session);
int cwmp_session_destructor (struct session *session);
int cwmp_init(int argc, char** argv,struct cwmp *cwmp);
int cwmp_exit(void);
void add_list_value_change(char *param_name, char *param_data, char *param_type);

60
xml.c
View file

@ -828,11 +828,11 @@ int cwmp_rpc_acs_prepare_message_inform (struct cwmp *cwmp, struct session *sess
free(c);
session->tree_out = tree;
cwmp_dm_ctx_clean(cwmp, &dmctx);
return 0;
error:
cwmp_dm_ctx_clean(cwmp, &dmctx);
return -1;
}
@ -1251,17 +1251,17 @@ int cwmp_handle_rpc_cpe_get_parameter_values(struct session *session, struct rpc
FREE(c);
#endif
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1359,17 +1359,17 @@ int cwmp_handle_rpc_cpe_get_parameter_names(struct session *session, struct rpc
FREE(c);
#endif
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1468,17 +1468,17 @@ int cwmp_handle_rpc_cpe_get_parameter_attributes(struct session *session, struct
FREE(c);
#endif
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1604,18 +1604,18 @@ int cwmp_handle_rpc_cpe_set_parameter_values(struct session *session, struct rpc
b = mxmlNewOpaque(b, "1");
if (!b) goto fault;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
rpc->list_set_value_fault = &dmctx.list_fault_param;
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1707,17 +1707,17 @@ int cwmp_handle_rpc_cpe_set_parameter_attributes(struct session *session, struct
b = mxmlNewElement(b, "cwmp:SetParameterAttributesResponse");
if (!b) goto fault;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1783,17 +1783,17 @@ int cwmp_handle_rpc_cpe_add_object(struct session *session, struct rpc *rpc)
b = mxmlNewOpaque(b, "1");
if (!b) goto fault;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -1853,17 +1853,17 @@ int cwmp_handle_rpc_cpe_delete_object(struct session *session, struct rpc *rpc)
b = mxmlNewOpaque(b, "1");
if (!b) goto fault;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
fault:
if (cwmp_create_fault_message(session, rpc, fault_code))
goto error;
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return 0;
error:
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
return -1;
}
@ -2440,7 +2440,7 @@ int cwmp_launch_upload(struct upload *pupload, struct transfer_complete **ptrans
lookup_vcf_name(pupload->f_instance, &name);
}
external_upload(pupload->url, pupload->file_type, pupload->username, pupload->password, name);
cwmp_dm_ctx_clean(&cwmp_main, &dmctx);
cwmp_dm_ctx_clean(&dmctx);
external_handle_action(cwmp_handle_uploadFault);
external_fetch_uploadFaultResp(&fault_code);
@ -3137,7 +3137,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
cwmp_dm_ctx_init(cwmp, &dmctx);
du_ref = get_deployment_unit_reference(&dmctx, package_name, package_env);
if (du_ref) res->du_ref = strdup(du_ref);
cwmp_dm_ctx_clean(cwmp, &dmctx);
}
if (package_uuid) res->uuid = strdup(package_uuid);
res->current_state = strdup("Installed");
@ -3159,7 +3159,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
if (!package_name || package_name[0] == '\0' || !package_version || package_version[0] == '\0' || !package_env || package_env[0] == '\0') {
error = FAULT_CPE_UNKNOWN_DEPLOYMENT_UNIT;
res->fault = error;
cwmp_dm_ctx_clean(cwmp, &dmctx);
break;
}
if (package_name) cur_name = strdup(package_name);
@ -3169,7 +3169,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
cwmp_dm_ctx_init(cwmp, &dmctx);
du_ref = get_deployment_unit_reference(&dmctx, cur_name, cur_env);
if (du_ref) res->du_ref = strdup(du_ref);
cwmp_dm_ctx_clean(cwmp, &dmctx);
}
if((p->version)[0] == '\0') {
error = cwmp_launch_du_uninstall(cur_name, cur_env, &res);
@ -3203,7 +3203,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
if ((p->url)[0] != '\0' && (p->uuid)[0] == '\0') {
cwmp_dm_ctx_init(cwmp, &dmctx);
cur_uuid = strdup(get_softwaremodules_uuid(p->url));
cwmp_dm_ctx_clean(cwmp, &dmctx);
if (cur_uuid == NULL || cur_uuid[0] == '\0') {
error = FAULT_CPE_UNKNOWN_DEPLOYMENT_UNIT;
break;
@ -3211,7 +3211,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
} else if ((p->url)[0] == '\0' && (p->uuid)[0] != '\0') {
cwmp_dm_ctx_init(cwmp, &dmctx);
cur_url = strdup(get_softwaremodules_url(p->uuid));
cwmp_dm_ctx_clean(cwmp, &dmctx);
if (cur_url == NULL || cur_url[0] == '\0') {
error = FAULT_CPE_UNKNOWN_DEPLOYMENT_UNIT;
break;
@ -3222,7 +3222,7 @@ void *thread_cwmp_rpc_cpe_change_du_state(void *v)
cwmp_dm_ctx_init(cwmp, &dmctx);
du_ref = get_deployment_unit_reference(&dmctx, package_name, package_env);
if (du_ref) res->du_ref = strdup(du_ref);
cwmp_dm_ctx_clean(cwmp, &dmctx);
}
if( error == FAULT_CPE_NO_FAULT) {
if (package_uuid) res->uuid = strdup(package_uuid);