[asterisk-commits] qwell: trunk r43374 - /trunk/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Wed Sep 20 16:42:45 2006
New Revision: 43374

URL: http://svn.digium.com/view/asterisk?rev=43374&view=rev
Log:
Fix some chan_zap warning messages, when HAVE_PRI is not defined.

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=43374&r1=43373&r2=43374&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Sep 20 16:42:45 2006
@@ -10325,11 +10325,11 @@
 static int build_channels(int iscrv, const char *value, int reload, int lineno, int *found_pseudo)
 {
 	char *c, *chan;
-	int x, y, start, finish;
+	int x, start, finish;
 	struct zt_pvt *tmp;
 #ifdef HAVE_PRI
 	struct zt_pri *pri;
-	int trunkgroup;
+	int trunkgroup, y;
 #endif
 	
 	if ((reload == 0) && (cur_signalling < 0)) {
@@ -10418,7 +10418,6 @@
 	char *ringc;
 	int y;
 	int found_pseudo = 0;
-	char *c;
 
 	while(v) {
 		/* Create the interface list */
@@ -10883,7 +10882,7 @@
 				overlapdial = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "pritimer")) {
 #ifdef PRI_GETSET_TIMERS
-				char *timerc;
+				char *timerc, *c;
 				int timer, timeridx;
 				c = v->value;
 				timerc = strsep(&c, ",");
@@ -11063,16 +11062,15 @@
 		
 static int setup_zap(int reload)
 {
-	int x;
 	struct ast_config *cfg;
 	struct ast_variable *v;
 	struct ast_variable *vjb;
+	int res;
+
+#ifdef HAVE_PRI
 	char *c;
-	int res;
-
-#ifdef HAVE_PRI
 	int spanno;
-	int i;
+	int i, x;
 	int logicalspan;
 	int trunkgroup;
 	int dchannels[NUM_DCHANS];