From 194a8d4d38367548845cf2076015bac17aff8a51 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 17 May 2023 16:37:07 +0200 Subject: [PATCH] presence_xml: clang-format for coherent indentation and coding style --- src/modules/presence_xml/notify_body.c | 16 ++++++++++------ src/modules/presence_xml/pidf.c | 6 +++--- src/modules/presence_xml/presence_xml.c | 4 ++-- src/modules/presence_xml/xcap_auth.c | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/modules/presence_xml/notify_body.c b/src/modules/presence_xml/notify_body.c index cc8c8d4c7e2..cf68fcb7ddd 100644 --- a/src/modules/presence_xml/notify_body.c +++ b/src/modules/presence_xml/notify_body.c @@ -45,7 +45,8 @@ extern str pxml_single_body_lookup_element; str *offline_nbody(str *body); str *aggregate_xmls(str *pres_user, str *pres_domain, str **body_array, int n); -str *aggregate_xmls_priority(str *pres_user, str *pres_domain, str **body_array, int n); +str *aggregate_xmls_priority( + str *pres_user, str *pres_domain, str **body_array, int n); str *get_final_notify_body( subs_t *subs, str *notify_body, xmlNodePtr rule_node); @@ -645,7 +646,8 @@ str *aggregate_xmls(str *pres_user, str *pres_domain, str **body_array, int n) return NULL; } -str *aggregate_xmls_priority(str *pres_user, str *pres_domain, str **body_array, int n) +str *aggregate_xmls_priority( + str *pres_user, str *pres_domain, str **body_array, int n) { int i, j = 0, idx = 0; xmlNodePtr p_root = NULL, new_p_root = NULL; @@ -684,13 +686,14 @@ str *aggregate_xmls_priority(str *pres_user, str *pres_domain, str **body_array, idx = --j; if(strlen(pxml_single_body_priorities.s) > 0 - && strlen(pxml_single_body_lookup_element.s) > 0) { + && strlen(pxml_single_body_lookup_element.s) > 0) { p_root = xmlDocGetNodeByName(xml_array[j], "presence", NULL); if(p_root == NULL) { LM_ERR("while getting the xml_tree root\n"); goto error; } - cur = xmlNodeGetNodeContentByName(p_root, pxml_single_body_lookup_element.s, NULL); + cur = xmlNodeGetNodeContentByName( + p_root, pxml_single_body_lookup_element.s, NULL); if(cur) { priority = strstr(pxml_single_body_priorities.s, cur); } @@ -702,8 +705,9 @@ str *aggregate_xmls_priority(str *pres_user, str *pres_domain, str **body_array, goto error; } - cmp = xmlNodeGetNodeContentByName(new_p_root, pxml_single_body_lookup_element.s, NULL); - if(cur != NULL && cmp != NULL && strcasecmp(cur,cmp)) { + cmp = xmlNodeGetNodeContentByName( + new_p_root, pxml_single_body_lookup_element.s, NULL); + if(cur != NULL && cmp != NULL && strcasecmp(cur, cmp)) { char *x1 = strstr(pxml_single_body_priorities.s, cmp); if(x1 > priority) { idx = i; diff --git a/src/modules/presence_xml/pidf.c b/src/modules/presence_xml/pidf.c index db843138f78..09d11438a0a 100644 --- a/src/modules/presence_xml/pidf.c +++ b/src/modules/presence_xml/pidf.c @@ -95,9 +95,9 @@ xmlNodePtr xmlNodeGetNodeByName( if(xmlStrcasecmp(cur->name, (unsigned char *)name) == 0) { if(!ns || (cur->ns - && xmlStrcasecmp( - cur->ns->prefix, (unsigned char *)ns) - == 0)) + && xmlStrcasecmp( + cur->ns->prefix, (unsigned char *)ns) + == 0)) return cur; } match = xmlNodeGetNodeByName(cur->children, name, ns); diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index bbec563d3bd..a4f5034d8b9 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -170,8 +170,8 @@ static int mod_init(void) return 0; } - LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(pxml_db_url.s), - pxml_db_url.len, pxml_db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(pxml_db_url.s), pxml_db_url.len, + pxml_db_url.s); /* bind the SL API */ if(sl_load_api(&slb) != 0) { diff --git a/src/modules/presence_xml/xcap_auth.c b/src/modules/presence_xml/xcap_auth.c index c40f0a899ee..adbcf0ebd44 100644 --- a/src/modules/presence_xml/xcap_auth.c +++ b/src/modules/presence_xml/xcap_auth.c @@ -300,7 +300,7 @@ xmlNodePtr get_rule_node(subs_t *subs, xmlDocPtr xcap_tree) LM_DBG("\n", domain); if((strlen(domain) != subs->from_domain.len && strncmp(domain, subs->from_domain.s, - subs->from_domain.len))) { + subs->from_domain.len))) { xmlFree(domain); continue; } @@ -336,7 +336,7 @@ xmlNodePtr get_rule_node(subs_t *subs, xmlDocPtr xcap_tree) if(strlen(domain) == subs->from_domain.len && (strncmp(domain, subs->from_domain.s, subs->from_domain.len) - == 0)) { + == 0)) { LM_DBG("except domain match\n"); xmlFree(domain); apply_rule = 0;