[svn-commits] rmudgett: branch group/issue14292 r698 - /team/group/issue14292/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Feb  6 17:23:03 2009
New Revision: 698

URL: http://svn.digium.com/svn-view/libpri?view=rev&rev=698
Log:
Resolved conflict and restarted automerge.

Merged revisions 696 via svnmerge from 
https://origsvn.digium.com/svn/libpri/team/group/issue14068

........
  r696 | rmudgett | 2009-02-06 17:10:40 -0600 (Fri, 06 Feb 2009) | 1 line
  
  Change to preserve libpri API compatibility
........

Modified:
    team/group/issue14292/   (props changed)
    team/group/issue14292/libpri.h
    team/group/issue14292/pri.c

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- issue14292-integrated (original)
+++ issue14292-integrated Fri Feb  6 17:23:03 2009
@@ -1,1 +1,1 @@
-/team/group/issue14068:1-693
+/team/group/issue14068:1-697

Modified: team/group/issue14292/libpri.h
URL: http://svn.digium.com/svn-view/libpri/team/group/issue14292/libpri.h?view=diff&rev=698&r1=697&r2=698
==============================================================================
--- team/group/issue14292/libpri.h (original)
+++ team/group/issue14292/libpri.h Fri Feb  6 17:23:03 2009
@@ -787,7 +787,8 @@
 int pri_sr_set_bearer(struct pri_sr *sr, int transmode, int userl1);
 int pri_sr_set_called(struct pri_sr *sr, char *called, int calledplan, int complete);
 int pri_sr_set_caller(struct pri_sr *sr, char *caller, char *callername, int callerplan, int callerpres);
-int pri_sr_set_redirecting(struct pri_sr *sr, char *name, char *num, int plan, int pres, int reason);
+int pri_sr_set_redirecting(struct pri_sr *sr, char *num, int plan, int pres, int reason);
+void pri_sr_set_redirecting_name(struct pri_sr *sr, char *name);
 
 int pri_sr_set_ccringout(struct pri_sr *sr, int ccringout);
 int pri_sr_set_ccbsnr(struct pri_sr *sr, int ccbsnr);

Modified: team/group/issue14292/pri.c
URL: http://svn.digium.com/svn-view/libpri/team/group/issue14292/pri.c?view=diff&rev=698&r1=697&r2=698
==============================================================================
--- team/group/issue14292/pri.c (original)
+++ team/group/issue14292/pri.c Fri Feb  6 17:23:03 2009
@@ -1128,9 +1128,8 @@
 	return 0;
 }
 
-int pri_sr_set_redirecting(struct pri_sr *sr, char *name, char *num, int plan, int pres, int reason)
-{
-	sr->redirectingname = name;
+int pri_sr_set_redirecting(struct pri_sr *sr, char *num, int plan, int pres, int reason)
+{
 	sr->redirectingnum = num;
 	sr->redirectingplan = plan;
 	sr->redirectingpres = pres;
@@ -1138,6 +1137,11 @@
 	return 0;
 }
 
+void pri_sr_set_redirecting_name(struct pri_sr *sr, char *name)
+{
+	sr->redirectingname = name;
+}
+
 int pri_sr_set_ccringout(struct pri_sr *sr, int ccringout)
 {
 	sr->ccringout = ccringout;