[svn-commits] mmichelson: branch mmichelson/subscription_abstraction r416580 - /team/mmiche...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jun 18 11:56:43 2014
New Revision: 416580

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416580
Log:
Rename the union from "pants" to "reality".


Modified:
    team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c

Modified: team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c?view=diff&rev=416580&r1=416579&r2=416580
==============================================================================
--- team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c (original)
+++ team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c Wed Jun 18 11:56:43 2014
@@ -298,7 +298,7 @@
 	union {
 		struct ast_sip_real_subscription real;
 		struct ast_sip_virtual_subscription virtual;
-	} pants;
+	} reality;
 	/*! Body generaator for NOTIFYs */
 	struct ast_sip_pubsub_body_generator *body_generator;
 	/*! Persistence information */
@@ -323,12 +323,12 @@
 
 static pjsip_evsub *sip_subscription_get_evsub(const struct ast_sip_subscription *sub)
 {
-	return sub->pants.real.evsub;
+	return sub->reality.real.evsub;
 }
 
 static pjsip_dialog *sip_subscription_get_dlg(const struct ast_sip_subscription *sub)
 {
-	return sub->pants.real.dlg;
+	return sub->reality.real.dlg;
 }
 
 /*! \brief Destructor for subscription persistence */
@@ -796,7 +796,7 @@
 	 * the subscription_destructor for more details
 	 */
 	pjsip_dlg_inc_session(dlg, &pubsub_module);
-	sub->pants.real.dlg = dlg;
+	sub->reality.real.dlg = dlg;
 	ast_sip_dialog_set_serializer(dlg, sub->serializer);
 	pjsip_evsub_set_mod_data(sip_subscription_get_evsub(sub), pubsub_module.id, sub);
 }
@@ -834,7 +834,7 @@
 		dlg->remote.cseq = persistence->cseq;
 	}
 
-	pjsip_evsub_create_uas(dlg, &pubsub_cb, rdata, 0, &sub->pants.real.evsub);
+	pjsip_evsub_create_uas(dlg, &pubsub_cb, rdata, 0, &sub->reality.real.evsub);
 	subscription_setup_dialog(sub, dlg);
 
 	add_subscription(sub);
@@ -874,7 +874,7 @@
 	}
 
 	pj_cstr(&event, handler->event_name);
-	pjsip_evsub_create_uac(dlg, &pubsub_cb, &event, 0, &sub->pants.real.evsub);
+	pjsip_evsub_create_uac(dlg, &pubsub_cb, &event, 0, &sub->reality.real.evsub);
 	subscription_setup_dialog(sub, dlg);
 
 	add_subscription(sub);