Merge pull request 'Fixed removing element when data is NULL' (#94) from YanTheKaller/libublsettings:master into master

Reviewed-on: #94
master v1.86
Dmitry Razumov 3 weeks ago
commit 978b9f0c01

@ -675,6 +675,7 @@ int yon_config_remove_element(char *key, char *delete_target, char *divider){
int found = 0; int found = 0;
yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key); yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key);
if (dict){ if (dict){
if (yon_char_is_empty(dict->data)) return 0;
char *temp = yon_char_remove_element((char*)dict->data,delete_target,divider); char *temp = yon_char_remove_element((char*)dict->data,delete_target,divider);
if (!yon_char_is_empty((char*)dict->data)) free(dict->data); if (!yon_char_is_empty((char*)dict->data)) free(dict->data);
dict->data = temp; dict->data = temp;
@ -689,6 +690,7 @@ int yon_config_remove_elements(char *key, char *delete_target, char *divider){
int found = 0; int found = 0;
yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key); yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key);
if (dict){ if (dict){
if (yon_char_is_empty(dict->data)) return 0;
char *temp = yon_char_remove_elements((char*)dict->data,delete_target,divider); char *temp = yon_char_remove_elements((char*)dict->data,delete_target,divider);
if (!yon_char_is_empty(temp)){ if (!yon_char_is_empty(temp)){
if (!yon_char_is_empty((char*)dict->data)) free(dict->data); if (!yon_char_is_empty((char*)dict->data)) free(dict->data);
@ -710,6 +712,7 @@ int yon_config_remove_elements_all(char *key, char *delete_target, char *divider
check_config{ check_config{
int found = 0; int found = 0;
yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key); yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key);
if (dict&&yon_char_is_empty(dict->data)) return 0;
if (dict&&yon_char_check_elements((char*)dict->data,delete_target,divider)){ if (dict&&yon_char_check_elements((char*)dict->data,delete_target,divider)){
char *temp = yon_char_remove_elements((char*)dict->data,delete_target,divider); char *temp = yon_char_remove_elements((char*)dict->data,delete_target,divider);
if (!yon_char_is_empty(temp)){ if (!yon_char_is_empty(temp)){

Loading…
Cancel
Save