[asterisk-commits] trunk r37907 - /trunk/channels/chan_skinny.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Tue Jul 18 16:19:59 2006
New Revision: 37907

URL: http://svn.digium.com/view/asterisk?rev=37907&view=rev
Log:
move variable declarations to the beginning of a block.


Modified:
    trunk/channels/chan_skinny.c

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?rev=37907&r1=37906&r2=37907&view=diff
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Tue Jul 18 16:19:59 2006
@@ -3144,14 +3144,14 @@
 	struct skinny_line *l;
 	int i;
 
-	if (!(req = req_alloc(sizeof(button_template_res_message), BUTTON_TEMPLATE_RES_MESSAGE)))
-		return -1;
-
 	struct skinny_speeddial *sd;
 	button_definition_template btn[42];
 	int lineInstance = 1;
 	int speeddialInstance = 1;
 	int buttonCount = 0;
+
+	if (!(req = req_alloc(sizeof(button_template_res_message), BUTTON_TEMPLATE_RES_MESSAGE)))
+		return -1;
 
 	memset(&btn, 0, sizeof(btn));
 
@@ -3351,6 +3351,7 @@
 	int i;
 	int x;
 	int y;
+	const soft_key_definitions *softkeymode = soft_key_default_definitions;
 
 	if (!(req = req_alloc(sizeof(soft_key_set_res_message), SOFT_KEY_SET_RES_MESSAGE)))
 		return -1;
@@ -3358,7 +3359,6 @@
 	req->data.softkeysets.softKeySetOffset = htolel(0);
 	req->data.softkeysets.softKeySetCount = htolel(11);
 	req->data.softkeysets.totalSoftKeySetCount = htolel(11);
-	const soft_key_definitions *softkeymode = soft_key_default_definitions;
 	for (x = 0; x < sizeof(soft_key_default_definitions) / sizeof(soft_key_definitions); x++) {
 		const uint8_t *defaults = softkeymode->defaults;
 		/* XXX I wanted to get the size of the array dynamically, but that wasn't wanting to work.