[svn-commits] mmichelson: branch group/CCSS r248484 - in /team/group/CCSS: channels/sip/inc...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Feb 23 14:46:55 2010
New Revision: 248484

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248484
Log:
* Move a struct in sip.h to avoid having to forward declare it.
* Use ast_vasprintf instead of vasprintf


Modified:
    team/group/CCSS/channels/sip/include/sip.h
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/sip/include/sip.h?view=diff&rev=248484&r1=248483&r2=248484
==============================================================================
--- team/group/CCSS/channels/sip/include/sip.h (original)
+++ team/group/CCSS/channels/sip/include/sip.h Tue Feb 23 14:46:55 2010
@@ -1526,25 +1526,7 @@
 	enum sip_cc_publish_state current_state;
 };
 
-struct sip_esc_entry;
 struct event_state_compositor;
-
-typedef int (* const esc_publish_callback)(struct sip_pvt *, struct sip_request *, struct event_state_compositor *, struct sip_esc_entry *);
-
-/*!
- * \brief Callbacks for SIP ESCs
- *
- * \details
- * The names of the callbacks are self-explanatory. The
- * corresponding handler is called whenever the specific
- * type of PUBLISH is received.
- */
-struct sip_esc_publish_callbacks {
-	const esc_publish_callback initial_handler;
-	const esc_publish_callback refresh_handler;
-	const esc_publish_callback modify_handler;
-	const esc_publish_callback remove_handler;
-};
 
 /*!
  * \brief common ESC items for all event types
@@ -1596,6 +1578,23 @@
 	 * the event package
 	 */
 	void *event_specific_data;
+};
+
+typedef int (* const esc_publish_callback)(struct sip_pvt *, struct sip_request *, struct event_state_compositor *, struct sip_esc_entry *);
+
+/*!
+ * \brief Callbacks for SIP ESCs
+ *
+ * \details
+ * The names of the callbacks are self-explanatory. The
+ * corresponding handler is called whenever the specific
+ * type of PUBLISH is received.
+ */
+struct sip_esc_publish_callbacks {
+	const esc_publish_callback initial_handler;
+	const esc_publish_callback refresh_handler;
+	const esc_publish_callback modify_handler;
+	const esc_publish_callback remove_handler;
 };
 
 struct sip_cc_agent_pvt {

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=248484&r1=248483&r2=248484
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Tue Feb 23 14:46:55 2010
@@ -3543,7 +3543,7 @@
 	}
 
 	va_start(ap, debug);
-	if (vasprintf(&failure_data->debug, debug, ap) == -1) {
+	if (ast_vasprintf(&failure_data->debug, debug, ap) == -1) {
 		va_end(ap);
 		ast_free((char *)failure_data->device_name);
 		ast_free(failure_data);