[sr-dev] git:hpw/branch_failure_route: modules/pv: Updated to use the new get_branch ()/next_branch() functions

[Hugh Waite]

Module: sip-router
Branch: hpw/branch_failure_route
Commit: a1e0c05e953140b026325117c3d8ace5a2ccf900
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1e0c05e953140b026325117c3d8ace5a2ccf900

Author: Hugh Waite <hugh.waite at crocodile-rcs.com>
Committer: Hugh Waite <hugh.waite at crocodile-rcs.com>
Date:   Wed Mar 27 11:53:18 2013 +0000

modules/pv: Updated to use the new get_branch()/next_branch() functions

- New instance parameter is currently not used

---

 modules/pv/pv_branch.c |    2 +-
 modules/pv/pv_core.c   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c
index b292e31..791bb5a 100644
--- a/modules/pv/pv_branch.c
+++ b/modules/pv/pv_branch.c
@@ -49,7 +49,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param,
 		return pv_get_null(msg, param, res);
 	}
 
-	uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid);
+	uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid, 0);
 
 	/* branch(count) doesn't need a valid branch, everything else does */
 	if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ ))
diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c
index 36dfbba..66ab63e 100644
--- a/modules/pv/pv_core.c
+++ b/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);
 
 
-	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0);
+	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0, 0, 0);
 	if (!branch.s) {
 		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;
 
-	while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0)))
+	while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0, 0, 0, 0)))
 	{
 		cnt++;
 		s.len += uri.len;
@@ -1411,7 +1411,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param,
 	i = 0;
 	p = pv_local_buf;
 
-	while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0)))
+	while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0, 0)))
 	{
 		if (i)
 		{