Fixed remove config checking if it was already removed #93

Merged
asmeron merged 4 commits from YanTheKaller/libublsettings:master into master 3 weeks ago

@ -602,12 +602,12 @@ int yon_config_remove_by_key(char *key){
check_config{ check_config{
dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,key); dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,key);
if (dict){ if (dict){
// if (!yon_dictionary_get(&__yon_config_ignored,dict->key)){ if (!yon_char_is_empty(dict->data)){
yon_config_remove_ignore(dict->key); yon_config_remove_ignore(dict->key);
((yon_config_parameter*)dict)->flag1=-1; ((yon_config_parameter*)dict)->flag1=-1;
dict->data=""; dict->data="";
return 1; return 1;
// } else return 0; }
} }
} }
return 0; return 0;
@ -619,6 +619,7 @@ int yon_config_remove_by_list(config_str keys, size_t size){
for (size_t i = 0;i<size;i++){ for (size_t i = 0;i<size;i++){
dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,keys[i]); dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,keys[i]);
if (dict){ if (dict){
if (!yon_char_is_empty(dict->data)){
yon_config_remove_ignore(dict->key); yon_config_remove_ignore(dict->key);
((yon_config_parameter*)dict)->flag1=-1; ((yon_config_parameter*)dict)->flag1=-1;
dict->data=""; dict->data="";
@ -626,6 +627,7 @@ int yon_config_remove_by_list(config_str keys, size_t size){
} }
} }
} }
}
return result; return result;
} }
@ -638,11 +640,13 @@ int yon_config_remove_by_args(char *key, ...){
while (!yon_char_is_empty(cur_key)){ while (!yon_char_is_empty(cur_key)){
dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,cur_key); dictionary *dict = yon_dictionary_get((dictionary**)&__yon__config__strings,cur_key);
if (dict){ if (dict){
if (!yon_char_is_empty(dict->data)){
yon_config_remove_ignore(dict->key); yon_config_remove_ignore(dict->key);
((yon_config_parameter*)dict)->flag1=-1; ((yon_config_parameter*)dict)->flag1=-1;
dict->data=""; dict->data="";
result=1; result=1;
} }
}
cur_key = va_arg(args,char*); cur_key = va_arg(args,char*);
} }
va_end(args); va_end(args);

Loading…
Cancel
Save