pv_headers: clang-format for coherent indentation and coding style

src/modules/pv_headers/pv_headers.c

@@ -65,7 +65,8 @@ static void mod_destroy(void);
 static int mod_init(void);
 
 static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params);
-static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb);
+static int handle_msg_failed_cb(
+		struct sip_msg *msg, unsigned int flags, void *cb);
 static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb);
 static int handle_msg_branch_cb(
 		struct sip_msg *msg, unsigned int flags, void *cb);
@@ -206,8 +207,7 @@ static int w_pvh_remove_header(
 	return pvh_remove_header(msg, &hname, indx);
 }
 
-static int w_pvh_header_param_exists(
-		struct sip_msg *msg, char *p1, char *p2)
+static int w_pvh_header_param_exists(struct sip_msg *msg, char *p1, char *p2)
 {
 	str hname = STR_NULL;
 	str value = STR_NULL;
@@ -221,29 +221,33 @@ static int w_pvh_header_param_exists(
 	return pvh_header_param_exists(msg, &hname, &value);
 }
 
-static int ki_pvh_remove_header_param(struct sip_msg *msg, str *hname, str *toRemove)
+static int ki_pvh_remove_header_param(
+		struct sip_msg *msg, str *hname, str *toRemove)
 {
 	int idx;
 	int new_size;
 	str dst = STR_NULL;
 	sr_xavp_t *avi = pvh_xavi_get_child(msg, &xavi_name, hname);
 
-	for(idx=0; avi != NULL; avi = xavi_get_next(avi)) {
-		if (avi->val.type == SR_XTYPE_STR && avi->val.v.s.s != NULL) {
+	for(idx = 0; avi != NULL; avi = xavi_get_next(avi)) {
+		if(avi->val.type == SR_XTYPE_STR && avi->val.v.s.s != NULL) {
 			if(str_casesearch(&avi->val.v.s, toRemove) != NULL) {
-				new_size = pvh_remove_header_param_helper(&avi->val.v.s, toRemove, &dst);
+				new_size = pvh_remove_header_param_helper(
+						&avi->val.v.s, toRemove, &dst);
 				if(dst.len == 0) {
 					LM_DBG("nothing left in the header:%.*s, remove it[%d]\n",
 							STR_FMT(hname), idx);
 					if(pvh_remove_header(msg, hname, idx) < 0)
 						return -1;
 				} else if(dst.len < 0 || new_size == avi->val.v.s.len) {
 					LM_DBG("'%.*s' not found at '%.*s'\n", STR_FMT(toRemove),
-						STR_FMT(&avi->val.v.s));
+							STR_FMT(&avi->val.v.s));
 				} else {
 					LM_DBG("old_value:'%.*s' new_value:'%.*s'\n",
-						STR_FMT(&avi->val.v.s), STR_FMT(&dst));
-					if(pvh_set_xavi(msg, &xavi_name, hname, &dst, SR_XTYPE_STR, idx, 0) < 0) {
+							STR_FMT(&avi->val.v.s), STR_FMT(&dst));
+					if(pvh_set_xavi(msg, &xavi_name, hname, &dst, SR_XTYPE_STR,
+							   idx, 0)
+							< 0) {
 						LM_ERR("can't set new value\n");
 						return -1;
 					}
@@ -586,8 +590,8 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb)
 
 	t = tmb.t_find(msg, &_branch, &vref);
 	if(t != NULL && t != T_UNDEFINED) {
-		LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t,
-				_branch, &t->xavis_list, t->nr_of_outgoings);
+		LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t, _branch,
+				&t->xavis_list, t->nr_of_outgoings);
 		list = &t->xavis_list;
 		backup_xavis = xavi_set_list(&t->xavis_list);
 	}

src/modules/pv_headers/pvh_func.c

@@ -96,7 +96,7 @@ int pvh_collect_headers(struct sip_msg *msg)
 		val.len = hf->body.len;
 		val.s = hf->body.s;
 
-		if(( marker = pvh_detect_split_char(val.s)) != NULL
+		if((marker = pvh_detect_split_char(val.s)) != NULL
 				&& str_hash_case_get(&split_headers, name.s, name.len)) {
 
 			if(pvh_split_values(&val, hvals, &d_size, 1, marker) < 0) {
@@ -360,19 +360,19 @@ int pvh_remove_header(struct sip_msg *msg, str *hname, int indx)
 
 int pvh_header_param_exists(struct sip_msg *msg, str *hname, str *hvalue)
 {
-	sr_xavp_t *avi=NULL;
+	sr_xavp_t *avi = NULL;
 	char head_name[header_name_size];
 	str br_xname = {head_name, header_name_size};
 
-	avi = xavi_get(&xavi_name,NULL);
+	avi = xavi_get(&xavi_name, NULL);
 	pvh_get_branch_xname(msg, &xavi_name, &br_xname);
 
 	avi = xavi_get_child(&br_xname, hname);
 
-	while(avi)
-	{
-		if (avi->val.type == SR_XTYPE_STR && avi->val.v.s.s != NULL && _strnstr(avi->val.v.s.s, hvalue->s, avi->val.v.s.len) != NULL)
-		{
+	while(avi) {
+		if(avi->val.type == SR_XTYPE_STR && avi->val.v.s.s != NULL
+				&& _strnstr(avi->val.v.s.s, hvalue->s, avi->val.v.s.len)
+						   != NULL) {
 			return 1;
 		}
 		avi = xavi_get_next(avi);
@@ -397,13 +397,16 @@ int pvh_remove_header_param_helper(str *orig, const str *toRemove, str *dst)
 	strncpy(t, orig->s, orig->len);
 	t[orig->len] = '\0';
 	token = strtok_r(t, ", ", &saveptr);
-	dst->s = NULL; dst->len = -1;
+	dst->s = NULL;
+	dst->len = -1;
 	while(token) {
 		notTarget = strncasecmp(token, toRemove->s, toRemove->len);
 		LM_DBG("offset:%d token:%s notTarget:%d\n", offset, token, notTarget);
 		if(notTarget) {
-			writtenChars = snprintf(result + offset, maxSize - offset, "%s, ", token);
-			if(writtenChars < 0) break;
+			writtenChars =
+					snprintf(result + offset, maxSize - offset, "%s, ", token);
+			if(writtenChars < 0)
+				break;
 			offset += writtenChars;
 		} else {
 			dst->len = 0; /* we found a token */
@@ -413,7 +416,8 @@ int pvh_remove_header_param_helper(str *orig, const str *toRemove, str *dst)
 
 	if(offset > 0) {
 		dst->s = result;
-		if(offset > 2 && result[offset-2] == ',' && result[offset-1] == ' ') {
+		if(offset > 2 && result[offset - 2] == ','
+				&& result[offset - 1] == ' ') {
 			LM_DBG("remove last separator\n");
 			offset = offset - 2;
 			result[offset] = '\0';

src/modules/pv_headers/pvh_xavp.c

@@ -309,7 +309,7 @@ int pvh_avp_is_null(sr_xavp_t *avp)
 
 	if(avp->val.type == SR_XTYPE_NULL
 			|| (avp->val.type == SR_XTYPE_STR
-					   && (strncasecmp(avp->val.v.s.s, "NULL", 4) == 0))) {
+					&& (strncasecmp(avp->val.v.s.s, "NULL", 4) == 0))) {
 		return 1;
 	}
 
@@ -772,7 +772,7 @@ int pvh_get_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
 		case 9: // displayname to
 			sval = c_data->to_b.display;
 			break;
-		case 5:  // from tag
+		case 5:	 // from tag
 		case 10: // to tag
 			sval = c_data->to_b.tag_value;
 			break;