[asterisk-commits] mnicholson: branch irroot/t38gateway-trunk r324473 - /team/irroot/t38gateway-...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun 22 09:32:11 2011
New Revision: 324473

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324473
Log:
renamed the framehook functions

Modified:
    team/irroot/t38gateway-trunk/res/res_fax.c

Modified: team/irroot/t38gateway-trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-trunk/res/res_fax.c?view=diff&rev=324473&r1=324472&r2=324473
==============================================================================
--- team/irroot/t38gateway-trunk/res/res_fax.c (original)
+++ team/irroot/t38gateway-trunk/res/res_fax.c Wed Jun 22 09:32:11 2011
@@ -2446,7 +2446,7 @@
 
 /*! \brief Destroy the gateway data structure when the framehook is detached
  * \param data framehook data (gateway data)*/
-static void t38_gw_fh_destroy(void *data) {
+static void fax_gateway_framehook_destroy(void *data) {
 	struct fax_gateway *gateway = data;
 
 	if (gateway->s) {
@@ -2469,8 +2469,7 @@
  * \param event framehook event
  * \param data framehook data (gateway)
  * \return processed frame or NULL when f is NULL or a null frame*/
-static struct ast_frame *t38_gw_framehook(struct ast_channel *chan,struct ast_frame *f,
-					  enum ast_framehook_event event,void *data) {
+static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct ast_frame *f, enum ast_framehook_event event, void *data) {
 	struct ast_control_t38_parameters *t38_parameters;
 	enum ast_t38_state		t38state;
 	enum ast_t38_state		t38pstate;
@@ -2656,13 +2655,13 @@
 /*! \brief Attach a gateway framehook object to a channel.
  * \param chan the channel to attach to
  */
-static int gateway_attach_hook(struct ast_channel *chan)
+static int fax_gateway_attach(struct ast_channel *chan)
 {
 	struct fax_gateway *gateway;
 	struct ast_framehook_interface fr_hook = {
 		.version = AST_FRAMEHOOK_INTERFACE_VERSION,
-		.event_cb = t38_gw_framehook,
-		.destroy_cb = t38_gw_fh_destroy,
+		.event_cb = fax_gateway_framehook,
+		.destroy_cb = fax_gateway_framehook_destroy,
 	};
 
 	/* set up the frame hook*/
@@ -3263,7 +3262,7 @@
 		const char *val = ast_skip_blanks(value);
 		if (ast_true(val)) {
 			if (details->gateway_id < 0) {
-				details->gateway_id = gateway_attach_hook(chan);
+				details->gateway_id = fax_gateway_attach(chan);
 				if (details->gateway_id < 0) {
 					ast_log(LOG_ERROR, "Error attaching T.38 gateway to channel %s.\n", chan->name);
 					res = -1;