xcap_server: clang-format for coherent indentation and coding style

src/modules/xcap_server/xcap_misc.c

@@ -41,41 +41,28 @@ extern str xcaps_root;
 static param_t *_xcaps_xpath_ns_root = NULL;
 
 /* list of supported auid  - ordered ascending by type */
-xcaps_auid_list_t xcaps_auid_list[] = {
-	{ { "pres-rules", 10 },
-			'/', PRES_RULES },
-	{ { "org.openmobilealliance.pres-rules", 33 },
-			'/', PRES_RULES },
-	{ { "resource-lists", 14 },
-			'/', RESOURCE_LIST },
-	{ { "rls-services", 12 },
-			'/', RLS_SERVICE },
-	{ { "pidf-manipulation", 17 },
-			'/', PIDF_MANIPULATION },
-	{ { "xcap-caps", 9 },
-			'/', XCAP_CAPS },
-	{ { "org.openmobilealliance.user-profile", 35},
-			'/', USER_PROFILE },
-	{ { "org.openmobilealliance.pres-content", 35},
-			'/', PRES_CONTENT },
-	{ { "org.openmobilealliance.search", 29},
-			'?', SEARCH },
-	{ { "org.openmobilealliance.xcap-directory", 37},
-			'/', DIRECTORY },
-
-	{ { 0, 0 }, 0, 0 }
-};
+xcaps_auid_list_t xcaps_auid_list[] = {{{"pres-rules", 10}, '/', PRES_RULES},
+		{{"org.openmobilealliance.pres-rules", 33}, '/', PRES_RULES},
+		{{"resource-lists", 14}, '/', RESOURCE_LIST},
+		{{"rls-services", 12}, '/', RLS_SERVICE},
+		{{"pidf-manipulation", 17}, '/', PIDF_MANIPULATION},
+		{{"xcap-caps", 9}, '/', XCAP_CAPS},
+		{{"org.openmobilealliance.user-profile", 35}, '/', USER_PROFILE},
+		{{"org.openmobilealliance.pres-content", 35}, '/', PRES_CONTENT},
+		{{"org.openmobilealliance.search", 29}, '?', SEARCH},
+		{{"org.openmobilealliance.xcap-directory", 37}, '/', DIRECTORY},
+
+		{{0, 0}, 0, 0}};
 
 static int xcaps_find_auid(str *s, xcap_uri_t *xuri)
 {
 	int i;
-	for(i=0; xcaps_auid_list[i].auid.s!=NULL; i++)
-	{
+	for(i = 0; xcaps_auid_list[i].auid.s != NULL; i++) {
 		if(s->len > xcaps_auid_list[i].auid.len
-			&& s->s[xcaps_auid_list[i].auid.len] == xcaps_auid_list[i].term
-			&& strncmp(s->s, xcaps_auid_list[i].auid.s,
-							xcaps_auid_list[i].auid.len) == 0)
-		{
+				&& s->s[xcaps_auid_list[i].auid.len] == xcaps_auid_list[i].term
+				&& strncmp(s->s, xcaps_auid_list[i].auid.s,
+						   xcaps_auid_list[i].auid.len)
+						   == 0) {
 			LM_DBG("matched %.*s\n", xcaps_auid_list[i].auid.len,
 					xcaps_auid_list[i].auid.s);
 			xuri->type = xcaps_auid_list[i].type;
@@ -84,8 +71,7 @@ static int xcaps_find_auid(str *s, xcap_uri_t *xuri)
 			return 0;
 		}
 	}
-	LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len,
-				xuri->uri.s);
+	LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len, xuri->uri.s);
 	return -1;
 }
 
@@ -98,14 +84,12 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri)
 	char *p;
 	int i;
 
-	if(huri==NULL || xuri==NULL || huri->s==NULL)
-	{
+	if(huri == NULL || xuri == NULL || huri->s == NULL) {
 		LM_ERR("invalid parameters\n");
 		return -1;
 	}
 
-	if(huri->len>XCAP_MAX_URI_SIZE)
-	{
+	if(huri->len > XCAP_MAX_URI_SIZE) {
 		LM_ERR("http uri too long\n");
 		return -1;
 	}
@@ -113,30 +97,30 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri)
 	memset(xuri, 0, sizeof(xcap_uri_t));
 
 	/* copy and url decode */
-	for(p=huri->s, i=0; p<huri->s+huri->len; p++)
-	{
-		if(*p=='%') {
-			if(p > huri->s+huri->len-2)
-			{
+	for(p = huri->s, i = 0; p < huri->s + huri->len; p++) {
+		if(*p == '%') {
+			if(p > huri->s + huri->len - 2) {
 				LM_ERR("invalid http uri - hexa value too short\n");
 				return -1;
 			}
 			p++;
-			if(*p>='0' && *p<='9')
+			if(*p >= '0' && *p <= '9')
 				xuri->buf[i] = (*p - '0') << 4;
-			else if(*p>='a'&&*p<='f')
-				xuri->buf[i] = (*p-'a'+10) << 4;
-			else if(*p>='A'&&*p<='F')
-				xuri->buf[i] = (*p-'A'+10) << 4;
-			else return -1;
+			else if(*p >= 'a' && *p <= 'f')
+				xuri->buf[i] = (*p - 'a' + 10) << 4;
+			else if(*p >= 'A' && *p <= 'F')
+				xuri->buf[i] = (*p - 'A' + 10) << 4;
+			else
+				return -1;
 			p++;
-			if(*p>='0'&&*p<='9')
-				xuri->buf[i] += *p-'0';
-			else if(*p>='a'&&*p<='f')
-				xuri->buf[i] += *p-'a'+10;
-			else if(*p>='A'&&*p<='F')
-				xuri->buf[i] += *p-'A'+10;
-			else return -1;
+			if(*p >= '0' && *p <= '9')
+				xuri->buf[i] += *p - '0';
+			else if(*p >= 'a' && *p <= 'f')
+				xuri->buf[i] += *p - 'a' + 10;
+			else if(*p >= 'A' && *p <= 'F')
+				xuri->buf[i] += *p - 'A' + 10;
+			else
+				return -1;
 		} else {
 			xuri->buf[i] = *p;
 		}
@@ -151,60 +135,55 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri)
 	xuri->root.s = xuri->uri.s;
 	s = xuri->uri;
 
-	if(xroot!=NULL)
-	{
-		if(xroot->len >= xuri->uri.len)
-		{
+	if(xroot != NULL) {
+		if(xroot->len >= xuri->uri.len) {
 			LM_ERR("invalid http uri - shorter than xcap-root\n");
 			return -1;
 		}
-		if(strncmp(xuri->uri.s, xroot->s, xroot->len)!=0)
-		{
-			LM_ERR("missing xcap-root in [%.*s]\n", xuri->uri.len,
-					xuri->uri.s);
+		if(strncmp(xuri->uri.s, xroot->s, xroot->len) != 0) {
+			LM_ERR("missing xcap-root in [%.*s]\n", xuri->uri.len, xuri->uri.s);
 			return -1;
 		}
 
-		s.s   = xuri->uri.s + xroot->len;
+		s.s = xuri->uri.s + xroot->len;
 		s.len = xuri->uri.len - xroot->len;
 		xuri->root.len = xroot->len;
 	}
-	if(*s.s == '/')
-	{
-		 s.s++;
-		 s.len--;
+	if(*s.s == '/') {
+		s.s++;
+		s.len--;
 	}
 
 	/* auid */
-	if(xcaps_find_auid(&s, xuri)<0)
+	if(xcaps_find_auid(&s, xuri) < 0)
 		return -1;
 
 	/* handling special auids */
 	if(xuri->type == SEARCH) {
-		s.s   += xuri->auid.len + 1;
+		s.s += xuri->auid.len + 1;
 		s.len -= xuri->auid.len + 1;
 
 		/* target */
-		if (s.len>7 && strncmp(s.s, "target=", 7)==0) {
+		if(s.len > 7 && strncmp(s.s, "target=", 7) == 0) {
 			LM_DBG("matched target=\n");
-			s.s   += 7;
+			s.s += 7;
 			s.len -= 7;
 			xuri->target.s = s.s;
 			p = strchr(s.s, '&');
-			if (p==NULL) {
+			if(p == NULL) {
 				xuri->target.len = s.len;
 			} else {
 				xuri->target.len = p - xuri->target.s;
 			}
-			s.s   += xuri->target.len + 1;
-			s.len -= xuri->target.len+1;
+			s.s += xuri->target.len + 1;
+			s.len -= xuri->target.len + 1;
 			LM_DBG("target=%.*s\n", xuri->target.len, xuri->target.s);
 		}
 
 		/* domain */
-		if (s.len>7 && strncmp(s.s, "domain=", 7)==0) {
+		if(s.len > 7 && strncmp(s.s, "domain=", 7) == 0) {
 			LM_DBG("matched domain=\n");
-			s.s   += 7;
+			s.s += 7;
 			s.len -= 7;
 			xuri->domain.s = s.s;
 			xuri->domain.len = s.len;
@@ -214,69 +193,66 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri)
 		return 0;
 	}
 
-	s.s   += xuri->auid.len + 1;
+	s.s += xuri->auid.len + 1;
 	s.len -= xuri->auid.len + 1;
 
 	/* tree: users or global */
 	xuri->tree.s = s.s;
-	if(s.len>6 && strncmp(s.s, "users/", 6)==0) {
+	if(s.len > 6 && strncmp(s.s, "users/", 6) == 0) {
 		LM_DBG("matched users\n");
 		xuri->tree.len = 5;
-	} else if(s.len>7 && strncmp(s.s, "global/", 7)==0) {
+	} else if(s.len > 7 && strncmp(s.s, "global/", 7) == 0) {
 		LM_DBG("matched global\n");
 		xuri->tree.len = 6;
 	} else {
-		LM_ERR("unsupported sub-tree in [%.*s]\n", xuri->uri.len,
-				xuri->uri.s);
+		LM_ERR("unsupported sub-tree in [%.*s]\n", xuri->uri.len, xuri->uri.s);
 		return -1;
 	}
 
-	s.s   += xuri->tree.len + 1;
+	s.s += xuri->tree.len + 1;
 	s.len -= xuri->tree.len + 1;
 
 	/* xuid */
-	if(xuri->tree.s[0]=='u') {
+	if(xuri->tree.s[0] == 'u') {
 		xuri->xuid.s = s.s;
 		p = strchr(s.s, '/');
-		if(p==NULL) {
-			LM_ERR("no xuid in [%.*s]\n", xuri->uri.len,
-					xuri->uri.s);
+		if(p == NULL) {
+			LM_ERR("no xuid in [%.*s]\n", xuri->uri.len, xuri->uri.s);
 			return -1;
 		}
 		xuri->xuid.len = p - xuri->xuid.s;
 
-		s.s   += xuri->xuid.len + 1;
+		s.s += xuri->xuid.len + 1;
 		s.len -= xuri->xuid.len + 1;
 	}
 
 	/* file */
 	xuri->file.s = s.s;
-	if(xuri->nss==NULL) {
+	if(xuri->nss == NULL) {
 		/* without node selector in http uri */
-		if(s.s[s.len-1]=='/')
+		if(s.s[s.len - 1] == '/')
 			xuri->file.len = s.len - 1;
 		else
 			xuri->file.len = s.len;
 	} else {
 		/* with node selector in http uri */
 		if(xuri->nss <= s.s) {
-			LM_ERR("no file in [%.*s]\n", xuri->uri.len,
-				xuri->uri.s);
+			LM_ERR("no file in [%.*s]\n", xuri->uri.len, xuri->uri.s);
 			return -1;
 		}
 		xuri->file.len = xuri->nss - s.s;
-		if(xuri->file.s[xuri->file.len-1]=='/')
+		if(xuri->file.s[xuri->file.len - 1] == '/')
 			xuri->file.len--;
 	}
 	/* doc: absolute and relative */
-	xuri->adoc.s   = xuri->uri.s;
+	xuri->adoc.s = xuri->uri.s;
 	xuri->adoc.len = xuri->file.s + xuri->file.len - xuri->adoc.s;
-	xuri->rdoc.s   = xuri->auid.s;
+	xuri->rdoc.s = xuri->auid.s;
 	xuri->rdoc.len = xuri->file.s + xuri->file.len - xuri->rdoc.s;
 
 	/* node */
-	if(xuri->nss!=NULL) {
-		xuri->node.s   = xuri->nss + 2;
+	if(xuri->nss != NULL) {
+		xuri->node.s = xuri->nss + 2;
 		xuri->node.len = xuri->uri.s + xuri->uri.len - xuri->node.s;
 	}
 
@@ -303,8 +279,8 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri)
 int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf)
 {
 	xmlDocPtr doc = NULL;
-	xmlXPathContextPtr xpathCtx = NULL; 
-	xmlXPathObjectPtr xpathObj = NULL; 
+	xmlXPathContextPtr xpathCtx = NULL;
+	xmlXPathObjectPtr xpathObj = NULL;
 	xmlNodeSetPtr nodes;
 	xmlChar *keyword;
 	xmlBufferPtr psBuf;
@@ -319,24 +295,20 @@ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf)
 		return -1;
 
 	xpathCtx = xmlXPathNewContext(doc);
-	if(xpathCtx == NULL)
-	{
+	if(xpathCtx == NULL) {
 		LM_ERR("unable to create new XPath context\n");
 		goto error;
 	}
-	
+
 	/* Evaluate xpath expression */
 	// xcaps_xpath_register_ns(xpathCtx);
-	xpathObj = xmlXPathEvalExpression(
-					(const xmlChar*)xpaths->s, xpathCtx);
-	if(xpathObj == NULL)
-	{
+	xpathObj = xmlXPathEvalExpression((const xmlChar *)xpaths->s, xpathCtx);
+	if(xpathObj == NULL) {
 		LM_ERR("unable to evaluate xpath expression [%s]\n", xpaths->s);
 		goto error;
 	}
 	nodes = xpathObj->nodesetval;
-	if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL)
-	{
+	if(nodes == NULL || nodes->nodeNr == 0 || nodes->nodeTab == NULL) {
 		outbuf->len = 0;
 		outbuf->s[outbuf->len] = '\0';
 		goto done;
@@ -344,63 +316,54 @@ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf)
 	size = nodes->nodeNr;
 	p = outbuf->s;
 	end = outbuf->s + outbuf->len;
-	for(i = 0; i < size; ++i)
-	{
-		if(nodes->nodeTab[i]==NULL)
+	for(i = 0; i < size; ++i) {
+		if(nodes->nodeTab[i] == NULL)
 			continue;
-		if(i!=0)
-		{
-			if(p>=end)
-			{
+		if(i != 0) {
+			if(p >= end) {
 				LM_ERR("output buffer overflow\n");
 				goto error;
 			}
 			*p = ',';
 			p++;
 		}
-		if(nodes->nodeTab[i]->type == XML_ATTRIBUTE_NODE)
-		{
-			keyword = xmlNodeListGetString(doc,
-				nodes->nodeTab[i]->children, 0);
-			if(keyword != NULL)
-			{
-				pos = p + strlen((char*)keyword);
-				if(pos>=end)
-				{
+		if(nodes->nodeTab[i]->type == XML_ATTRIBUTE_NODE) {
+			keyword = xmlNodeListGetString(doc, nodes->nodeTab[i]->children, 0);
+			if(keyword != NULL) {
+				pos = p + strlen((char *)keyword);
+				if(pos >= end) {
 					LM_ERR("output buffer overflow\n");
 					goto error;
 				}
-				strcpy(p, (char*)keyword);
+				strcpy(p, (char *)keyword);
 				p = pos;
 				xmlFree(keyword);
 				keyword = NULL;
 			}
 		} else {
-			if(nodes->nodeTab[i]->content!=NULL)
-			{
-				pos = p + strlen((char*)nodes->nodeTab[i]->content);
-				if(pos>=end)
-				{
+			if(nodes->nodeTab[i]->content != NULL) {
+				pos = p + strlen((char *)nodes->nodeTab[i]->content);
+				if(pos >= end) {
 					LM_ERR("output buffer overflow\n");
 					goto error;
 				}
-				strcpy(p, (char*)nodes->nodeTab[i]->content);
+				strcpy(p, (char *)nodes->nodeTab[i]->content);
 				p = pos;
 			} else {
 				psBuf = xmlBufferCreate();
-				if(psBuf != NULL && xmlNodeDump(psBuf, doc,
-						nodes->nodeTab[i], 0, 0)>0)
-				{
-					pos = p + strlen((char*)xmlBufferContent(psBuf));
-					if(pos>=end)
-					{
+				if(psBuf != NULL
+						&& xmlNodeDump(psBuf, doc, nodes->nodeTab[i], 0, 0)
+								   > 0) {
+					pos = p + strlen((char *)xmlBufferContent(psBuf));
+					if(pos >= end) {
 						LM_ERR("output buffer overflow\n");
 						goto error;
 					}
-					strcpy(p, (char*)xmlBufferContent(psBuf));
+					strcpy(p, (char *)xmlBufferContent(psBuf));
 					p = pos;
 				}
-				if(psBuf != NULL) xmlBufferFree(psBuf);
+				if(psBuf != NULL)
+					xmlBufferFree(psBuf);
 				psBuf = NULL;
 			}
 		}
@@ -409,21 +372,27 @@ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf)
 	outbuf->s[outbuf->len] = '\0';
 
 done:
-	if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj);
-	if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); 
-	if(doc!=NULL) xmlFreeDoc(doc);
+	if(xpathObj != NULL)
+		xmlXPathFreeObject(xpathObj);
+	if(xpathCtx != NULL)
+		xmlXPathFreeContext(xpathCtx);
+	if(doc != NULL)
+		xmlFreeDoc(doc);
 	xpathObj = NULL;
-	xpathCtx = NULL; 
-	doc = NULL; 
+	xpathCtx = NULL;
+	doc = NULL;
 	return 0;
 
 error:
-	if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj);
-	if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); 
-	if(doc!=NULL) xmlFreeDoc(doc);
+	if(xpathObj != NULL)
+		xmlXPathFreeObject(xpathObj);
+	if(xpathCtx != NULL)
+		xmlXPathFreeContext(xpathCtx);
+	if(doc != NULL)
+		xmlFreeDoc(doc);
 	xpathObj = NULL;
-	xpathCtx = NULL; 
-	doc = NULL; 
+	xpathCtx = NULL;
+	doc = NULL;
 	outbuf->len = 0;
 	outbuf->s[outbuf->len] = '\0';
 	return -1;
@@ -439,7 +408,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 	xmlXPathContextPtr xpathCtx = NULL;
 	xmlXPathObjectPtr xpathObj = NULL;
 	xmlNodeSetPtr nodes;
-	const xmlChar* value = NULL;
+	const xmlChar *value = NULL;
 	xmlChar *xmem = NULL;
 	xmlNodePtr parent = NULL;
 	int size;
@@ -450,49 +419,42 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 	if(doc == NULL)
 		return -1;
 
-	if(val!=NULL)
-	{
+	if(val != NULL) {
 		newnode = xmlParseMemory(val->s, val->len);
-		if(newnode==NULL)
+		if(newnode == NULL)
 			goto error;
 	}
 
-	outbuf->s   = NULL;
+	outbuf->s = NULL;
 	outbuf->len = 0;
 
 	xpathCtx = xmlXPathNewContext(doc);
-	if(xpathCtx == NULL)
-	{
+	if(xpathCtx == NULL) {
 		LM_ERR("unable to create new XPath context\n");
 		goto error;
 	}
 
 	/* Evaluate xpath expression */
-	xpathObj = xmlXPathEvalExpression(
-					(const xmlChar*)xpaths->s, xpathCtx);
-	if(xpathObj == NULL)
-	{
+	xpathObj = xmlXPathEvalExpression((const xmlChar *)xpaths->s, xpathCtx);
+	if(xpathObj == NULL) {
 		LM_ERR("unable to evaluate xpath expression [%s]\n", xpaths->s);
 		goto error;
 	}
 	nodes = xpathObj->nodesetval;
-	if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL)
-	{
+	if(nodes == NULL || nodes->nodeNr == 0 || nodes->nodeTab == NULL) {
 		/* no selection for xpath expression */
 		LM_DBG("no selection for xpath expression [%s]\n", xpaths->s);
-		if(val==NULL)
+		if(val == NULL)
 			goto done;
 		/* could be an insert - locate the selection of parent node */
 		p = strrchr(xpaths->s, '/');
-		if(p==NULL)
+		if(p == NULL)
 			goto done;
 		/* evaluate xpath expression for parrent node */
 		*p = 0;
 		xmlXPathFreeObject(xpathObj);
-		xpathObj = xmlXPathEvalExpression(
-					(const xmlChar*)xpaths->s, xpathCtx);
-		if(xpathObj == NULL)
-		{
+		xpathObj = xmlXPathEvalExpression((const xmlChar *)xpaths->s, xpathCtx);
+		if(xpathObj == NULL) {
 			LM_DBG("unable to evaluate xpath parent expression [%s]\n",
 					xpaths->s);
 			*p = '/';
@@ -500,34 +462,33 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 		}
 		*p = '/';
 		nodes = xpathObj->nodesetval;
-		if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL)
-		{
+		if(nodes == NULL || nodes->nodeNr == 0 || nodes->nodeTab == NULL) {
 			LM_DBG("no selection for xpath parent expression [%s]\n",
 					xpaths->s);
 			goto done;
 		}
 		/* add the new content as child to first selected element node */
-		if(nodes->nodeTab[0]==NULL)
-		{
+		if(nodes->nodeTab[0] == NULL) {
 			LM_DBG("selection for xpath parent expression has first child"
-					" NULL [%s]\n", xpaths->s);
+				   " NULL [%s]\n",
+					xpaths->s);
 			goto done;
 		}
-		if(nodes->nodeTab[0]->type==XML_ELEMENT_NODE)
-		{
+		if(nodes->nodeTab[0]->type == XML_ELEMENT_NODE) {
 			xmlAddChild(nodes->nodeTab[0], xmlCopyNode(newnode->children, 1));
 		} else {
 			LM_DBG("selection for xpath parent expression is not element"
-					" node [%s]\n", xpaths->s);
+				   " node [%s]\n",
+					xpaths->s);
 			goto done;
 		}
 	} else {
 		/* selection for xpath expression */
 		size = nodes->nodeNr;
-		if(val!=NULL)
-			value = (const xmlChar*)val->s;
+		if(val != NULL)
+			value = (const xmlChar *)val->s;
 
-	/*
+		/*
 	 * NOTE: the nodes are processed in reverse order, i.e. reverse document
 	 *       order because xmlNodeSetContent can actually free up descendant
 	 *       of the node and such nodes may have been selected too ! Handling
@@ -536,22 +497,21 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 	 *       done carefully !
 	 */
 		for(i = size - 1; i >= 0; i--) {
-			if(nodes->nodeTab[i]==NULL)
+			if(nodes->nodeTab[i] == NULL)
 				continue;
 
-			if(nodes->nodeTab[i]->type==XML_ELEMENT_NODE)
-			{
+			if(nodes->nodeTab[i]->type == XML_ELEMENT_NODE) {
 				parent = nodes->nodeTab[i]->parent;
 				xmlUnlinkNode(nodes->nodeTab[i]);
-				if(val!=NULL && newnode!=NULL)
+				if(val != NULL && newnode != NULL)
 					xmlAddChild(parent, xmlCopyNode(newnode->children, 1));
 			} else {
-				if(val!=NULL)
+				if(val != NULL)
 					xmlNodeSetContent(nodes->nodeTab[i], value);
 				else
-					xmlNodeSetContent(nodes->nodeTab[i], (const xmlChar*)"");
+					xmlNodeSetContent(nodes->nodeTab[i], (const xmlChar *)"");
 			}
-		/*
+			/*
 		 * All the elements returned by an XPath query are pointers to
 		 * elements from the tree *except* namespace nodes where the XPath
 		 * semantic is different from the implementation in libxml2 tree.
@@ -568,27 +528,24 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 		 *   - remove the reference to the modified nodes from the node set
 		 *     as they are processed, if they are not namespace nodes.
 		 */
-			if (nodes->nodeTab[i]->type != XML_NAMESPACE_DECL)
+			if(nodes->nodeTab[i]->type != XML_NAMESPACE_DECL)
 				nodes->nodeTab[i] = NULL;
 		}
 	}
 
 	xmlDocDumpMemory(doc, &xmem, &size);
-	if(xmem==NULL)
-	{
+	if(xmem == NULL) {
 		LM_ERR("error printing output\n");
 		goto error;
 	}
 
-	if(size<=0)
-	{
+	if(size <= 0) {
 		LM_ERR("invalid output size\n");
 		xmlFree(xmem);
 		goto error;
 	}
-	outbuf->s = (char*)pkg_malloc(size+1);
-	if(outbuf->s==NULL)
-	{
+	outbuf->s = (char *)pkg_malloc(size + 1);
+	if(outbuf->s == NULL) {
 		PKG_MEM_ERROR_FMT("for output\n");
 		xmlFree(xmem);
 		goto error;
@@ -599,18 +556,26 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf)
 	xmlFree(xmem);
 
 done:
-	if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj);
-	if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx);
-	if(doc!=NULL) xmlFreeDoc(doc);
-	if(newnode!=NULL) xmlFreeDoc(newnode);
+	if(xpathObj != NULL)
+		xmlXPathFreeObject(xpathObj);
+	if(xpathCtx != NULL)
+		xmlXPathFreeContext(xpathCtx);
+	if(doc != NULL)
+		xmlFreeDoc(doc);
+	if(newnode != NULL)
+		xmlFreeDoc(newnode);
 	return 0;
 
 error:
-	if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj);
-	if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx);
-	if(doc!=NULL) xmlFreeDoc(doc);
-	if(newnode!=NULL) xmlFreeDoc(newnode);
-	outbuf->s =   NULL;
+	if(xpathObj != NULL)
+		xmlXPathFreeObject(xpathObj);
+	if(xpathCtx != NULL)
+		xmlXPathFreeContext(xpathCtx);
+	if(doc != NULL)
+		xmlFreeDoc(doc);
+	if(newnode != NULL)
+		xmlFreeDoc(newnode);
+	outbuf->s = NULL;
 	outbuf->len = 0;
 	return -1;
 }
@@ -623,8 +588,8 @@ void xcaps_xpath_register_ns(xmlXPathContextPtr xpathCtx)
 	param_t *ns;
 	ns = _xcaps_xpath_ns_root;
 	while(ns) {
-		xmlXPathRegisterNs(xpathCtx, (xmlChar*)ns->name.s,
-				(xmlChar*)ns->body.s);
+		xmlXPathRegisterNs(
+				xpathCtx, (xmlChar *)ns->name.s, (xmlChar *)ns->body.s);
 		ns = ns->next;
 	}
 }
@@ -637,27 +602,25 @@ int xcaps_xpath_ns_param(modparam_t type, void *val)
 	char *p;
 	param_t *ns;
 
-	if(val==NULL)
+	if(val == NULL)
 		goto error;
-	ns = (param_t*)pkg_malloc(sizeof(param_t));
+	ns = (param_t *)pkg_malloc(sizeof(param_t));
 
-	if(ns==NULL)
-	{
+	if(ns == NULL) {
 		PKG_MEM_ERROR;
 		goto error;
 	}
 	memset(ns, 0, sizeof(param_t));
 
-	p = strchr((const char*)val, '=');
-	if(p==NULL)
-	{
+	p = strchr((const char *)val, '=');
+	if(p == NULL) {
 		ns->name.s = "";
-		ns->body.s = (char*)val;
+		ns->body.s = (char *)val;
 		ns->body.len = strlen(ns->body.s);
 	} else {
 		*p = 0;
 		p++;
-		ns->name.s = (char*)val;
+		ns->name.s = (char *)val;
 		ns->name.len = strlen(ns->name.s);
 		ns->body.s = p;
 		ns->body.len = strlen(ns->body.s);
@@ -667,7 +630,6 @@ int xcaps_xpath_ns_param(modparam_t type, void *val)
 	return 0;
 error:
 	return -1;
-
 }
 
 /**
@@ -679,11 +641,11 @@ int xcaps_check_doc_validity(str *doc)
 
 	xmlDocPtr docxml = NULL;
 
-	if(doc==NULL || doc->s==NULL || doc->len<0)
+	if(doc == NULL || doc->s == NULL || doc->len < 0)
 		return -1;
 
 	docxml = xmlParseMemory(doc->s, doc->len);
-	if(docxml==NULL)
+	if(docxml == NULL)
 		return -1;
 	xmlFreeDoc(docxml);
 	return 0;
@@ -693,14 +655,16 @@ int xcaps_check_doc_validity(str *doc)
 /**
  * xcapuri PV export
  */
-typedef struct _pv_xcap_uri {
+typedef struct _pv_xcap_uri
+{
 	str name;
 	unsigned int id;
 	xcap_uri_t xuri;
 	struct _pv_xcap_uri *next;
 } pv_xcap_uri_t;
 
-typedef struct _pv_xcap_uri_spec {
+typedef struct _pv_xcap_uri_spec
+{
 	str name;
 	str key;
 	int ktype;
@@ -721,20 +685,17 @@ pv_xcap_uri_t *pv_xcap_uri_get_struct(str *name)
 	id = get_hash1_raw(name->s, name->len);
 	it = _pv_xcap_uri_root;
 
-	while(it!=NULL)
-	{
-		if(id == it->id && name->len==it->name.len
-				&& strncmp(name->s, it->name.s, name->len)==0)
-		{
+	while(it != NULL) {
+		if(id == it->id && name->len == it->name.len
+				&& strncmp(name->s, it->name.s, name->len) == 0) {
 			LM_DBG("uri found [%.*s]\n", name->len, name->s);
 			return it;
 		}
 		it = it->next;
 	}
 
-	it = (pv_xcap_uri_t*)pkg_malloc(sizeof(pv_xcap_uri_t));
-	if(it==NULL)
-	{
+	it = (pv_xcap_uri_t *)pkg_malloc(sizeof(pv_xcap_uri_t));
+	if(it == NULL) {
 		PKG_MEM_ERROR;
 		return NULL;
 	}
@@ -757,12 +718,11 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in)
 	pv_xcap_uri_spec_t *pxs = NULL;
 	char *p;
 
-	if(in->s==NULL || in->len<=0)
+	if(in->s == NULL || in->len <= 0)
 		return -1;
 
-	pxs = (pv_xcap_uri_spec_t*)pkg_malloc(sizeof(pv_xcap_uri_spec_t));
-	if(pxs==NULL)
-	{
+	pxs = (pv_xcap_uri_spec_t *)pkg_malloc(sizeof(pv_xcap_uri_spec_t));
+	if(pxs == NULL) {
 		PKG_MEM_ERROR;
 		return -1;
 	}
@@ -770,29 +730,29 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in)
 
 	p = in->s;
 
-	while(p<in->s+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+	while(p < in->s + in->len
+			&& (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r'))
 		p++;
-	if(p>in->s+in->len || *p=='\0')
+	if(p > in->s + in->len || *p == '\0')
 		goto error;
 	pxs->name.s = p;
-	while(p < in->s + in->len)
-	{
-		if(*p=='=' || *p==' ' || *p=='\t' || *p=='\n' || *p=='\r')
+	while(p < in->s + in->len) {
+		if(*p == '=' || *p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')
 			break;
 		p++;
 	}
-	if(p>in->s+in->len || *p=='\0')
+	if(p > in->s + in->len || *p == '\0')
 		goto error;
 	pxs->name.len = p - pxs->name.s;
-	if(*p!='=')
-	{
-		while(p<in->s+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+	if(*p != '=') {
+		while(p < in->s + in->len
+				&& (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r'))
 			p++;
-		if(p>in->s+in->len || *p=='\0' || *p!='=')
+		if(p > in->s + in->len || *p == '\0' || *p != '=')
 			goto error;
 	}
 	p++;
-	if(*p!='>')
+	if(*p != '>')
 		goto error;
 	p++;
 
@@ -800,41 +760,41 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in)
 	pxs->key.s = p;
 	LM_DBG("uri name [%.*s] - key [%.*s]\n", pxs->name.len, pxs->name.s,
 			pxs->key.len, pxs->key.s);
-	if(pxs->key.len==4 && strncmp(pxs->key.s, "data", 4)==0) {
+	if(pxs->key.len == 4 && strncmp(pxs->key.s, "data", 4) == 0) {
 		pxs->ktype = 0;
-	} else if(pxs->key.len==3 && strncmp(pxs->key.s, "uri", 3)==0) {
+	} else if(pxs->key.len == 3 && strncmp(pxs->key.s, "uri", 3) == 0) {
 		pxs->ktype = 1;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "root", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "root", 4) == 0) {
 		pxs->ktype = 2;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "auid", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "auid", 4) == 0) {
 		pxs->ktype = 3;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "type", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "type", 4) == 0) {
 		pxs->ktype = 4;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "tree", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "tree", 4) == 0) {
 		pxs->ktype = 5;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "xuid", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "xuid", 4) == 0) {
 		pxs->ktype = 6;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "file", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "file", 4) == 0) {
 		pxs->ktype = 7;
-	} else if(pxs->key.len==4 && strncmp(pxs->key.s, "node", 4)==0) {
+	} else if(pxs->key.len == 4 && strncmp(pxs->key.s, "node", 4) == 0) {
 		pxs->ktype = 8;
-	} else if(pxs->key.len==6 && strncmp(pxs->key.s, "target", 6)==0) {
+	} else if(pxs->key.len == 6 && strncmp(pxs->key.s, "target", 6) == 0) {
 		pxs->ktype = 9;
-	} else if(pxs->key.len==6 && strncmp(pxs->key.s, "domain", 6)==0) {
+	} else if(pxs->key.len == 6 && strncmp(pxs->key.s, "domain", 6) == 0) {
 		pxs->ktype = 10;
-	} else if(pxs->key.len== 8 && strncmp(pxs->key.s, "uri_adoc", 8)==0) {
+	} else if(pxs->key.len == 8 && strncmp(pxs->key.s, "uri_adoc", 8) == 0) {
 		pxs->ktype = 11;
 	} else {
 		LM_ERR("unknown key type [%.*s]\n", in->len, in->s);
 		goto error;
 	}
 	pxs->xus = pv_xcap_uri_get_struct(&pxs->name);
-	sp->pvp.pvn.u.dname = (void*)pxs;
+	sp->pvp.pvn.u.dname = (void *)pxs;
 	sp->pvp.pvn.type = PV_NAME_OTHER;
 	return 0;
 
 error:
-	if(pxs!=NULL)
+	if(pxs != NULL)
 		pkg_free(pxs);
 	return -1;
 }
@@ -842,23 +802,21 @@ error:
 /**
  *
  */
-int pv_set_xcap_uri(struct sip_msg* msg, pv_param_t *param,
-		int op, pv_value_t *val)
+int pv_set_xcap_uri(
+		struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val)
 {
 	pv_xcap_uri_spec_t *pxs = NULL;
 
-	pxs = (pv_xcap_uri_spec_t*)param->pvn.u.dname;
-	if(pxs->xus==NULL)
+	pxs = (pv_xcap_uri_spec_t *)param->pvn.u.dname;
+	if(pxs->xus == NULL)
 		return -1;
-	if(!(val->flags&PV_VAL_STR))
+	if(!(val->flags & PV_VAL_STR))
 		return -1;
-	if(pxs->ktype!=0)
+	if(pxs->ktype != 0)
 		return -1;
 	/* set uri data */
-	if(xcap_parse_uri(&val->rs, &xcaps_root, &pxs->xus->xuri)<0)
-	{
-		LM_ERR("error setting xcap uri data [%.*s]\n",
-				val->rs.len, val->rs.s);
+	if(xcap_parse_uri(&val->rs, &xcaps_root, &pxs->xus->xuri) < 0) {
+		LM_ERR("error setting xcap uri data [%.*s]\n", val->rs.len, val->rs.s);
 		return -1;
 	}
 
@@ -868,71 +826,70 @@ int pv_set_xcap_uri(struct sip_msg* msg, pv_param_t *param,
 /**
  *
  */
-int pv_get_xcap_uri(struct sip_msg *msg,  pv_param_t *param,
-		pv_value_t *res)
+int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
 {
 	pv_xcap_uri_spec_t *pxs = NULL;
 
-	pxs = (pv_xcap_uri_spec_t*)param->pvn.u.dname;
-	if(pxs->xus==NULL)
+	pxs = (pv_xcap_uri_spec_t *)param->pvn.u.dname;
+	if(pxs->xus == NULL)
 		return -1;
 
 	switch(pxs->ktype) {
 		case 0:
 		case 1:
 			/* get uri */
-			if(pxs->xus->xuri.uri.len>0)
+			if(pxs->xus->xuri.uri.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.uri);
-		break;
+			break;
 		case 2:
 			/* get root */
-			if(pxs->xus->xuri.root.len>0)
+			if(pxs->xus->xuri.root.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.root);
-		break;
+			break;
 		case 3:
 			/* get auid */
-			if(pxs->xus->xuri.auid.len>0)
+			if(pxs->xus->xuri.auid.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.auid);
-		break;
+			break;
 		case 4:
 			/* get type */
 			return pv_get_sintval(msg, param, res, pxs->xus->xuri.type);
-		break;
+			break;
 		case 5:
 			/* get tree */
-			if(pxs->xus->xuri.tree.len>0)
+			if(pxs->xus->xuri.tree.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.tree);
-		break;
+			break;
 		case 6:
 			/* get xuid */
-			if(pxs->xus->xuri.xuid.len>0)
+			if(pxs->xus->xuri.xuid.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.xuid);
-		break;
+			break;
 		case 7:
 			/* get file */
-			if(pxs->xus->xuri.file.len>0)
+			if(pxs->xus->xuri.file.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.file);
-		break;
+			break;
 		case 8:
 			/* get node */
-			if(pxs->xus->xuri.node.len>0)
+			if(pxs->xus->xuri.node.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.node);
-		break;
+			break;
 		case 9:
 			/* get target */
-			if(pxs->xus->xuri.target.len>0)
+			if(pxs->xus->xuri.target.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.target);
-		break;
+			break;
 		case 10:
 			/* get domain */
-			if(pxs->xus->xuri.domain.len>0)
+			if(pxs->xus->xuri.domain.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.domain);
 		case 11:
 			/* get xuri->adoc */
-			if(pxs->xus->xuri.adoc.len>0)
+			if(pxs->xus->xuri.adoc.len > 0)
 				return pv_get_strval(msg, param, res, &pxs->xus->xuri.adoc);
-		break;
-		break;
+			break;
+			break;
 		default:
 			return pv_get_null(msg, param, res);
 	}

src/modules/xcap_server/xcap_misc.h

@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-		       
+
 #ifndef _XCAP_MISC_H_
 #define _XCAP_MISC_H_
 
@@ -29,12 +29,13 @@
 #include "../../core/sr_module.h"
 #include "../../core/pvar.h"
 
-#define XCAP_MAX_URI_SIZE	255
+#define XCAP_MAX_URI_SIZE 255
 /* Node Selector Separator */
-#define XCAP_NSS	"~~"
+#define XCAP_NSS "~~"
 
-typedef struct xcap_uri {
-	char buf[XCAP_MAX_URI_SIZE+1];
+typedef struct xcap_uri
+{
+	char buf[XCAP_MAX_URI_SIZE + 1];
 	str uri;
 	str root;
 	str auid;
@@ -50,7 +51,8 @@ typedef struct xcap_uri {
 	str domain;
 } xcap_uri_t;
 
-typedef struct xcaps_auid_list {
+typedef struct xcaps_auid_list
+{
 	str auid;  /* auid value */
 	char term; /* ending char (next one after auid) */
 	int type;  /* internal type id for auid */
@@ -63,10 +65,9 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf);
 int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf);
 int xcaps_check_doc_validity(str *doc);
 
-int pv_get_xcap_uri(struct sip_msg *msg,  pv_param_t *param,
-		pv_value_t *res);
-int pv_set_xcap_uri(struct sip_msg* msg, pv_param_t *param,
-		int op, pv_value_t *val);
+int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);
+int pv_set_xcap_uri(
+		struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val);
 int pv_parse_xcap_uri_name(pv_spec_p sp, str *in);
 
 #endif