kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Config and XML tweaks needed for geolocation

Browse Source 
Added:

Replace a variable in a list:
int ast_variable_list_replace_variable(struct ast_variable **head,
    struct ast_variable *old, struct ast_variable *new);
Added test as well.

Create a "name=value" string from a variable list:
'name1="val1",name2="val2"', etc.
struct ast_str *ast_variable_list_join(
    const struct ast_variable *head, const char *item_separator,
    const char *name_value_separator, const char *quote_char,
    struct ast_str **str);
Added test as well.

Allow the name of an XML element to be changed.
void ast_xml_set_name(struct ast_xml_node *node, const char *name);

Change-Id: I330a5f63dc0c218e0d8dfc0745948d2812141ccb
This commit is contained in:
George Joseph
2022-02-20 13:16:22 -07:00
committed by Friendly Automation
parent e29cd99975
commit 38df1c35ee
5 changed files with 149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
main/config.c
View File

@@ -679,6 +679,49 @@ int ast_variable_list_replace(struct ast_variable **head, struct ast_variable *r
return -1;
}
int ast_variable_list_replace_variable(struct ast_variable **head, struct ast_variable *old,
struct ast_variable *new)
{
struct ast_variable *v, **prev = head;
for (v = *head; v; prev = &v->next, v = v->next) {
if (v == old) {
new->next = v->next;
*prev = new;
ast_free(v);
return 0;
}
}
return -1;
}
struct ast_str *ast_variable_list_join(const struct ast_variable *head, const char *item_separator,
const char *name_value_separator, const char *quote_char, struct ast_str **str)
{
struct ast_variable *var = (struct ast_variable *)head;
struct ast_str *local_str = NULL;
if (str == NULL || *str == NULL) {
local_str = ast_str_create(AST_MAX_USER_FIELD);
if (!local_str) {
return NULL;
}
} else {
local_str = *str;
}
for (; var; var = var->next) {
ast_str_append(&local_str, 0, "%s%s%s%s%s%s", var->name, name_value_separator, S_OR(quote_char, ""),
var->value, S_OR(quote_char, ""), var->next ? item_separator : "");
}
if (str != NULL) {
*str = local_str;
}
return local_str;
}
const char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var)
{
const char *tmp;

9
main/xml.c
View File

@@ -332,6 +332,15 @@ void ast_xml_set_text(struct ast_xml_node *node, const char *content)
xmlNodeSetContent((xmlNode *) node, (const xmlChar *) content);
}
void ast_xml_set_name(struct ast_xml_node *node, const char *name)
{
if (!node || !name) {
return;
}
xmlNodeSetName((xmlNode *) node, (const xmlChar *) name);
}
int ast_xml_doc_dump_file(FILE *output, struct ast_xml_doc *doc)
{
return xmlDocDump(output, (xmlDocPtr)doc);