[asterisk-commits] murf: trunk r39806 - /trunk/channels/chan_h323.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Aug 15 11:35:06 2006
New Revision: 39806

URL: http://svn.digium.com/view/asterisk?rev=39806&view=rev
Log:

Made "style" change requested by Kevin Fleming... used initializer in declaration,
brought decl down to block where the variable is used, got rid of memset.


Modified:
    trunk/channels/chan_h323.c

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?rev=39806&r1=39805&r2=39806&view=diff
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Tue Aug 15 11:35:06 2006
@@ -253,8 +253,6 @@
 /* Channel and private structures should be already locked */
 static void __oh323_update_info(struct ast_channel *c, struct oh323_pvt *pvt)
 {
-	struct ast_frame f;
-
 	if (c->nativeformats != pvt->nativeformats) {
 		if (h323debug)
 			ast_log(LOG_DEBUG, "Preparing %s for new native format\n", c->name);
@@ -280,14 +278,9 @@
 		pvt->newcontrol = -1;
 	}
 	if (pvt->newdigit >= 0) {
-		memset(&f, 0, sizeof(f));
-		f.frametype = AST_FRAME_DTMF;
-		f.subclass = pvt->newdigit;
-		f.datalen = 0;
+		struct ast_frame f = {AST_FRAME_DTMF, pvt->newdigit, };
+
 		f.samples = 800;
-		f.offset = 0;
-		f.data = NULL;
-		f.mallocd = 0;
 		f.src = "UPDATE_INFO";
 		ast_queue_frame(c, &f);
 		pvt->newdigit = -1;
@@ -1156,7 +1149,6 @@
 int send_digit(unsigned call_reference, char digit, const char *token)
 {
 	struct oh323_pvt *pvt;
-	struct ast_frame f;
 	int res;
 
 	ast_log(LOG_DEBUG, "Received Digit: %c\n", digit);
@@ -1166,14 +1158,8 @@
 		return -1;
 	}
 	if (pvt->owner && !ast_mutex_trylock(&pvt->owner->lock)) {
-		memset(&f, 0, sizeof(f));
-		f.frametype = AST_FRAME_DTMF;
-		f.subclass = digit;
-		f.datalen = 0;
+		struct ast_frame f = {AST_FRAME_DTMF, digit, };
 		f.samples = 800;
-		f.offset = 0;
-		f.data = NULL;
-		f.mallocd = 0;
 		f.src = "SEND_DIGIT";
 		res = ast_queue_frame(pvt->owner, &f);
 		ast_mutex_unlock(&pvt->owner->lock);