[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r136919 - in /team/sean...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sat Aug  9 09:20:00 2008
New Revision: 136919

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136919
Log:
Merged revisions 136888,136890,136917 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r136888 | seanbright | 2008-08-09 08:53:57 -0400 (Sat, 09 Aug 2008) | 4 lines

Merge more changes from the resolve-shadow-warnings branch (henceforth known
as RSW since i am too lazy to keep typing it all out).  This time a few of
the channels.

........
r136890 | seanbright | 2008-08-09 09:13:48 -0400 (Sat, 09 Aug 2008) | 2 lines

Biggest offender?  chan_dahdi.c!  More RSW merging.

........
r136917 | seanbright | 2008-08-09 10:12:34 -0400 (Sat, 09 Aug 2008) | 2 lines

More RSW merges.  This should do it for the channels/ dir.

........

Modified:
    team/seanbright/resolve-shadow-warnings/   (props changed)
    team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c
    team/seanbright/resolve-shadow-warnings/channels/chan_phone.c
    team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c
    team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Aug  9 09:20:00 2008
@@ -1,1 +1,1 @@
-/trunk:1-136886
+/trunk:1-136918

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c?view=diff&rev=136919&r1=136918&r2=136919
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c Sat Aug  9 09:20:00 2008
@@ -137,7 +137,6 @@
 
 #define DEFAULT_CONTEXT "default"
 
-static char default_parkinglot[AST_MAX_CONTEXT];
 static char default_parkinglot[AST_MAX_CONTEXT];
 
 static char language[MAX_LANGUAGE] = "";
@@ -9694,9 +9693,9 @@
 				/* Someone grabbed our thread *right* after we timed out.
 				 * Wait for them to set us up with something to do and signal
 				 * us to continue. */
-				tv = ast_tvadd(ast_tvnow(), ast_samp2tv(30000, 1000));
-				ts.tv_sec = tv.tv_sec;
-				ts.tv_nsec = tv.tv_usec * 1000;
+				wait = ast_tvadd(ast_tvnow(), ast_samp2tv(30000, 1000));
+				ts.tv_sec = wait.tv_sec;
+				ts.tv_nsec = wait.tv_usec * 1000;
 				if (ast_cond_timedwait(&thread->cond, &thread->lock, &ts) == ETIMEDOUT)
 				{
 					ast_mutex_unlock(&thread->lock);

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_phone.c?view=diff&rev=136919&r1=136918&r2=136919
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_phone.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_phone.c Sat Aug  9 09:20:00 2008
@@ -847,15 +847,15 @@
 static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *cntx)
 {
 	struct ast_channel *tmp;
-	struct phone_codec_data new_codec;
+	struct phone_codec_data queried_codec;
 	tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "", i->ext, i->context, 0, "Phone/%s", i->dev + 5);
 	if (tmp) {
 		tmp->tech = cur_tech;
 		ast_channel_set_fd(tmp, 0, i->fd);
 		/* XXX Switching formats silently causes kernel panics XXX */
 		if (i->mode == MODE_FXS &&
-		    ioctl(i->fd, PHONE_QUERY_CODEC, &new_codec) == 0) {
-			if (new_codec.type == LINEAR16)
+		    ioctl(i->fd, PHONE_QUERY_CODEC, &queried_codec) == 0) {
+			if (queried_codec.type == LINEAR16)
 				tmp->nativeformats =
 				tmp->rawreadformat =
 				tmp->rawwriteformat =

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c?view=diff&rev=136919&r1=136918&r2=136919
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c Sat Aug  9 09:20:00 2008
@@ -666,8 +666,8 @@
 
 #define BUFFSEND unsigned char buffsend[64] = { 0x00, 0x00, 0xaa, 0xbb, 0x02, 0x01 }
 
-const static char tdesc[] = "UNISTIM Channel Driver";
-const static char channel_type[] = "USTM";
+static const char tdesc[] = "UNISTIM Channel Driver";
+static const char channel_type[] = "USTM";
 
 /*! Protos */
 static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state);

Modified: team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c?view=diff&rev=136919&r1=136918&r2=136919
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c Sat Aug  9 09:20:00 2008
@@ -856,8 +856,8 @@
 		temp0 =	x0 * a1;
 		   x0 = input[i];
 		temp1 = input[i] * a0;
-		   _y0 = (temp0 + temp1)/calcAdjust;
-		   _y0 =(_y0*outputGain)/M_Q8;
+		  _y0 = (temp0 + temp1)/calcAdjust;
+		  _y0 = (_y0*outputGain)/M_Q8;
 		
 		if(_y0>32766)_y0=32766;
 		else if(_y0<-32766)_y0=-32766;