[Devel] CVS commitlog: sip-server dset.c dset.h sip-server/modules/lcr lcr_mod.c sip-server/modules/permissions permissions.c sip-server/modules/tm t_fwd.c

[Juha Heinanen]

items.c was updated to use the new style branch iteration.  patch is
enclosed.

-- juha

*** /usr/src/orig/openser/HEAD/sip-server/items.c	2005-08-29 11:26:38.000000000 +0300
--- items.c	2005-08-31 08:34:51.477890520 +0300
***************
*** 1119,1127 ****
  	if(msg->first_line.type == SIP_REPLY)
  		return xl_get_null(msg, res, param);
  
! 
! 	init_branch_iterator();
! 	branch.s = next_branch(&branch.len, &q, 0, 0, 0);
  	if (!branch.s) {
  		return xl_get_null(msg, res, param);
  	}
--- 1119,1125 ----
  	if(msg->first_line.type == SIP_REPLY)
  		return xl_get_null(msg, res, param);
  
! 	branch.s = get_branch(0, &branch.len, &q, 0, 0, 0);
  	if (!branch.s) {
  		return xl_get_null(msg, res, param);
  	}
***************
*** 1152,1159 ****
    
  	cnt = len = 0;
  
! 	init_branch_iterator();
! 	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0)))
  	{
  		cnt++;
  		len += uri.len;
--- 1150,1156 ----
    
  	cnt = len = 0;
  
! 	while ((uri.s = get_branch(cnt, &uri.len, &q, 0, 0, 0)))
  	{
  		cnt++;
  		len += uri.len;
***************
*** 1177,1184 ****
  	i = 0;
  	p = local_buf;
  
! 	init_branch_iterator();
! 	while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0)))
  	{
  		if (i)
  		{
--- 1174,1180 ----
  	i = 0;
  	p = local_buf;
  
! 	while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0)))
  	{
  		if (i)
  		{