[asterisk-commits] mogorman: branch mogorman/asterisk-jabber r41277 - /team/mogorman/asterisk-ja...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Tue Aug 29 14:41:42 2006
New Revision: 41277

URL: http://svn.digium.com/view/asterisk?rev=41277&view=rev
Log:
hmm i should test stuff before i commit it.

Modified:
    team/mogorman/asterisk-jabber/channels/chan_gtalk.c

Modified: team/mogorman/asterisk-jabber/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-jabber/channels/chan_gtalk.c?rev=41277&r1=41276&r2=41277&view=diff
==============================================================================
--- team/mogorman/asterisk-jabber/channels/chan_gtalk.c (original)
+++ team/mogorman/asterisk-jabber/channels/chan_gtalk.c Tue Aug 29 14:41:42 2006
@@ -190,7 +190,7 @@
 /*----- RTP interface functions */
 static int gtalk_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp,
 							   struct ast_rtp *vrtp, int codecs, int nat_active);
-static enum ast_rtp_get_rtesult *gtalk_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
+static enum ast_rtp_get_result gtalk_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
 static int gtalk_get_codec(struct ast_channel *chan);
 
 /*! \brief PBX interface structure for channel registration */
@@ -516,7 +516,7 @@
 	return res;
 }
 
-static enum ast_rtp_get_result *gtalk_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
+static enum ast_rtp_get_result gtalk_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
 {
 	struct gtalk_pvt *p = chan->tech_pvt;
 	enum ast_rtp_get_result res = AST_RTP_GET_FAILED;
@@ -526,7 +526,7 @@
 
 	ast_mutex_lock(&p->lock);
 	if (p->rtp){
-		rtp = p->rtp;
+		*rtp = p->rtp;
 		res = AST_RTP_TRY_NATIVE;
 	}
 	ast_mutex_unlock(&p->lock);
@@ -828,7 +828,7 @@
 	struct aji_resource *resources = NULL;
 	struct aji_buddy *buddy;
 	char idroster[200];
-	char *data, *exten;
+	char *data, *exten = NULL;
 
 	if (option_debug)
 		ast_log(LOG_DEBUG, "The client is %s for alloc\n", client->name);