[svn-commits] rmudgett: branch group/issue14068 r856 - /team/group/issue14068/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jun  4 12:27:18 2009
New Revision: 856

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=856
Log:
Eliminated the need for some libpri structs that did not add anything useful.

struct pri_subcmd_connected_line
struct pri_subcmd_redirecting

Modified:
    team/group/issue14068/libpri.h
    team/group/issue14068/pri_facility.c
    team/group/issue14068/q931.c

Modified: team/group/issue14068/libpri.h
URL: http://svn.asterisk.org/svn-view/libpri/team/group/issue14068/libpri.h?view=diff&rev=856&r1=855&r2=856
==============================================================================
--- team/group/issue14068/libpri.h (original)
+++ team/group/issue14068/libpri.h Thu Jun  4 12:27:18 2009
@@ -437,22 +437,14 @@
 #define PRI_SUBCMD_CONNECTED_LINE	2
 
 
-struct pri_subcmd_connected_line {/* BUGBUG eliminate this struct since it is not adding anything useful. */
-	struct pri_party_connected_line party;
-};
-
-struct pri_subcmd_redirecting {/* BUGBUG eliminate this struct since it is not adding anything useful. */
-	struct pri_party_redirecting party;
-};
-
 struct pri_subcommand {
 	/*! PRI_SUBCMD_xxx defined values */
 	int cmd;
 	union {
 		/*! Reserve room for possible expansion to maintain ABI compatibility. */
 		char reserve_space[512];
-		struct pri_subcmd_connected_line connected_line;
-		struct pri_subcmd_redirecting redirecting;
+		struct pri_party_connected_line connected_line;
+		struct pri_party_redirecting redirecting;
 	} u;
 };
 

Modified: team/group/issue14068/pri_facility.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/issue14068/pri_facility.c?view=diff&rev=856&r1=855&r2=856
==============================================================================
--- team/group/issue14068/pri_facility.c (original)
+++ team/group/issue14068/pri_facility.c Thu Jun  4 12:27:18 2009
@@ -2356,7 +2356,7 @@
 			break;
 		}
 		subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
-		q931_party_id_copy_to_pri(&subcmd->u.connected_line.party.id, &call->remote_id);
+		q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
 		break;
 	case ROSE_QSIG_ConnectedName:
 		/* ConnectedName is put in remote_id.name */
@@ -2716,7 +2716,7 @@
 			}
 			/* Setup redirecting subcommand */
 			subcmd->cmd = PRI_SUBCMD_REDIRECTING;
-			q931_party_redirecting_copy_to_pri(&subcmd->u.redirecting.party,
+			q931_party_redirecting_copy_to_pri(&subcmd->u.redirecting,
 				&call->redirecting);
 			break;
 		default:

Modified: team/group/issue14068/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/issue14068/q931.c?view=diff&rev=856&r1=855&r2=856
==============================================================================
--- team/group/issue14068/q931.c (original)
+++ team/group/issue14068/q931.c Thu Jun  4 12:27:18 2009
@@ -4342,7 +4342,7 @@
 			if (subcmd) {
 				/* Setup redirecting subcommand */
 				subcmd->cmd = PRI_SUBCMD_REDIRECTING;
-				q931_party_redirecting_copy_to_pri(&subcmd->u.redirecting.party,
+				q931_party_redirecting_copy_to_pri(&subcmd->u.redirecting,
 					&c->redirecting);
 			}
 		}
@@ -4410,7 +4410,7 @@
 			subcmd = q931_alloc_subcommand(ctrl);
 			if (subcmd) {
 				subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
-				q931_party_id_copy_to_pri(&subcmd->u.connected_line.party.id, &c->remote_id);
+				q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &c->remote_id);
 			}
 
 			return Q931_RES_HAVEEVENT;
@@ -4426,7 +4426,7 @@
 			subcmd = q931_alloc_subcommand(ctrl);
 			if (subcmd) {
 				subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
-				q931_party_id_copy_to_pri(&subcmd->u.connected_line.party.id, &c->remote_id);
+				q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &c->remote_id);
 			}
 			break;
 		default: