mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-25 23:28:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lpconfig: avoid duplicate comments in linphonerc

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-05 11:49:38 +02:00
parent 982c96847d
commit 8dd252fd7b
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
coreapi/lpconfig.c
View file

@ -171,6 +171,11 @@ void lp_config_remove_section(LpConfig *lpconfig, LpSection *section){
lp_section_destroy(section);
}
void lp_section_remove_item(LpSection *sec, LpItem *item){
sec->items=ms_list_remove(sec->items,(void *)item);
lp_item_destroy(item);
}
static bool_t is_first_char(const char *start, const char *pos){
const char *p;
for(p=start;p<pos;p++){
@ -213,6 +218,20 @@ LpSectionParam *lp_section_find_param(const LpSection *sec, const char *key){
return NULL;
}
LpItem *lp_section_find_comment(const LpSection *sec, const char *comment){
MSList *elem;
LpItem *item;
/*printf("Looking for item %s\n",name);*/
for (elem=sec->items;elem!=NULL;elem=ms_list_next(elem)){
item=(LpItem*)elem->data;
if (item->is_comment && strcmp(item->value,comment)==0) {
/*printf("Item %s found\n",name);*/
return item;
}
}
return NULL;
}
LpItem *lp_section_find_item(const LpSection *sec, const char *name){
MSList *elem;
LpItem *item;
@ -283,6 +302,10 @@ static LpSection* lp_config_parse_line(LpConfig* lpconfig, const char* line, LpS
if (is_a_comment(line)){
if (cur){
LpItem *comment=lp_comment_new(line);
item=lp_section_find_comment(cur,comment->value);
if (item!=NULL) {
lp_section_remove_item(cur, item);
}
lp_section_add_item(cur,comment);
}
}else{
@ -467,11 +490,6 @@ void lp_config_destroy(LpConfig *lpconfig){
lp_config_unref(lpconfig);
}
void lp_section_remove_item(LpSection *sec, LpItem *item){
sec->items=ms_list_remove(sec->items,(void *)item);
lp_item_destroy(item);
}
const char *lp_config_get_section_param_string(const LpConfig *lpconfig, const char *section, const char *key, const char *default_value){
LpSection *sec;
LpSectionParam *param;