[asterisk-commits] mmichelson: branch mmichelson/subscription_abstraction r416636 - in /team/mmi...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jun 18 12:46:36 2014
New Revision: 416636

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416636
Log:
Finish that thought.


Modified:
    team/mmichelson/subscription_abstraction/include/asterisk/res_pjsip_pubsub.h
    team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c

Modified: team/mmichelson/subscription_abstraction/include/asterisk/res_pjsip_pubsub.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/subscription_abstraction/include/asterisk/res_pjsip_pubsub.h?view=diff&rev=416636&r1=416635&r2=416636
==============================================================================
--- team/mmichelson/subscription_abstraction/include/asterisk/res_pjsip_pubsub.h (original)
+++ team/mmichelson/subscription_abstraction/include/asterisk/res_pjsip_pubsub.h Wed Jun 18 12:46:36 2014
@@ -350,18 +350,6 @@
 const char *ast_sip_subscription_get_resource_name(struct ast_sip_subscription *sub);
 
 /*!
- * \brief Accept a subscription request
- *
- * \param sub The subscription to be accepted
- * \param rdata The received subscription request
- * \param response The response code to send
- *
- * \retval 0 Success
- * \retval non-zero Failure
- */
-int ast_sip_subscription_accept(struct ast_sip_subscription *sub, pjsip_rx_data *rdata, int response);
-
-/*!
  * \brief Send a request created via a PJSIP evsub method
  *
  * Callers of this function should take care to do so within a SIP servant

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=416636&r1=416635&r2=416636
==============================================================================
--- team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c (original)
+++ team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c Wed Jun 18 12:46:36 2014
@@ -989,7 +989,7 @@
 	return sub->resource;
 }
 
-int sip_subscription_accept(struct ast_sip_subscription *sub, pjsip_rx_data *rdata, int response)
+static int sip_subscription_accept(struct ast_sip_subscription *sub, pjsip_rx_data *rdata, int response)
 {
 	/* If this is a persistence recreation the subscription has already been accepted */
 	if (ast_sip_mod_data_get(rdata->endpt_info.mod_data, pubsub_module.id, MOD_DATA_PERSISTENCE)) {