kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 61690 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61690 | russell | 2007-04-20 13:19:18 -0500 (Fri, 20 Apr 2007) | 4 lines

Fix the UpdateConfig manager action to properly treat "variables" and "objects"
differently (a=b versus a=>b).
(issue #9568, reported by pari, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-04-20 18:23:24 +00:00
parent 49af71c100
commit 97d0661327
4 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
main/config.c
View File

@@ -468,54 +468,41 @@ int ast_variable_delete(struct ast_category *category, const char *variable, con
return res;
}
int ast_variable_update(struct ast_category *category, const char *variable, const char *value, const char *match)
int ast_variable_update(struct ast_category *category, const char *variable,
const char *value, const char *match, unsigned int object)
{
struct ast_variable *cur, *prev=NULL, *newer;
newer = ast_variable_new(variable, value);
if (!newer)
if (!(newer = ast_variable_new(variable, value)))
return -1;
cur = category->root;
while (cur) {
if (cur->name == variable) {
newer->next = cur->next;
newer->object = cur->object;
if (prev)
prev->next = newer;
else
category->root = newer;
if (category->last == cur)
category->last = newer;
cur->next = NULL;
ast_variables_destroy(cur);
return 0;
}
prev = cur;
cur = cur->next;
newer->object = object;
for (cur = category->root; cur; prev = cur, cur = cur->next) {
if (strcasecmp(cur->name, variable) ||
(!ast_strlen_zero(match) && strcasecmp(cur->value, match)))
continue;
newer->next = cur->next;
newer->object = cur->object || object;
if (prev)
prev->next = newer;
else
category->root = newer;
if (category->last == cur)
category->last = newer;
cur->next = NULL;
ast_variables_destroy(cur);
return 0;
}
prev = NULL;
cur = category->root;
while (cur) {
if (!strcasecmp(cur->name, variable) && (ast_strlen_zero(match) || !strcasecmp(cur->value, match))) {
newer->next = cur->next;
newer->object = cur->object;
if (prev)
prev->next = newer;
else
category->root = newer;
if (category->last == cur)
category->last = newer;
cur->next = NULL;
ast_variables_destroy(cur);
return 0;
}
prev = cur;
cur = cur->next;
}
if (prev)
prev->next = newer;
else
category->root = newer;
return 0;
}