|
|
|
@ -241,7 +241,7 @@ void *on_setup_system_configuration(void * data){
|
|
|
|
if (user_size){
|
|
|
|
if (user_size){
|
|
|
|
int final_size;
|
|
|
|
int final_size;
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
|
|
|
|
yon_char_parsed_free(users,user_size);
|
|
|
|
// yon_char_parsed_free(users,user_size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
all_parameters = final;
|
|
|
|
all_parameters = final;
|
|
|
|
size = final_size;
|
|
|
|
size = final_size;
|
|
|
|
@ -250,7 +250,7 @@ void *on_setup_system_configuration(void * data){
|
|
|
|
if (users){
|
|
|
|
if (users){
|
|
|
|
int final_size;
|
|
|
|
int final_size;
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
|
|
|
|
yon_char_parsed_free(users,user_size);
|
|
|
|
// yon_char_parsed_free(users,user_size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
all_parameters = final;
|
|
|
|
all_parameters = final;
|
|
|
|
size = final_size;
|
|
|
|
size = final_size;
|
|
|
|
@ -260,7 +260,7 @@ void *on_setup_system_configuration(void * data){
|
|
|
|
if (network_size){
|
|
|
|
if (network_size){
|
|
|
|
int final_size;
|
|
|
|
int final_size;
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,networks,network_size,&final_size);
|
|
|
|
config_str final = yon_char_parsed_merge(all_parameters,size,networks,network_size,&final_size);
|
|
|
|
yon_char_parsed_free(networks,network_size);
|
|
|
|
// yon_char_parsed_free(networks,network_size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
if (size) yon_char_parsed_free(all_parameters,size);
|
|
|
|
all_parameters = final;
|
|
|
|
all_parameters = final;
|
|
|
|
size = final_size;
|
|
|
|
size = final_size;
|
|
|
|
|