Browse Source

modules/pv: updated use of get_branch() and next_branch() to cope with additional argument

Peter Dunkley 12 years ago
parent
commit
a16fb22d12
2 changed files with 4 additions and 4 deletions
  1. 1 1
      modules/pv/pv_branch.c
  2. 3 3
      modules/pv/pv_core.c

+ 1 - 1
modules/pv/pv_branch.c

@@ -48,7 +48,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param,
 		return pv_get_null(msg, param, res);
 		return pv_get_null(msg, param, res);
 	}
 	}
 
 
-	uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket);
+	uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, 0);
 
 
 	/* branch(count) doesn't need a valid branch, everything else does */
 	/* branch(count) doesn't need a valid branch, everything else does */
 	if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ ))
 	if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ ))

+ 3 - 3
modules/pv/pv_core.c

@@ -1358,7 +1358,7 @@ int pv_get_branch(struct sip_msg *msg, pv_param_t *param,
 		return pv_get_null(msg, param, res);
 		return pv_get_null(msg, param, res);
 
 
 
 
-	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0);
+	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0);
 	if (!branch.s) {
 	if (!branch.s) {
 		return pv_get_null(msg, param, res);
 		return pv_get_null(msg, param, res);
 	}
 	}
@@ -1387,7 +1387,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param,
   
   
 	cnt = s.len = 0;
 	cnt = s.len = 0;
 
 
-	while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0)))
+	while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0)))
 	{
 	{
 		cnt++;
 		cnt++;
 		s.len += uri.len;
 		s.len += uri.len;
@@ -1411,7 +1411,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param,
 	i = 0;
 	i = 0;
 	p = pv_local_buf;
 	p = pv_local_buf;
 
 
-	while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0)))
+	while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0)))
 	{
 	{
 		if (i)
 		if (i)
 		{
 		{