[asterisk-commits] crichter: trunk r81376 - in /trunk: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: crichter
Date: Thu Aug 30 09:54:30 2007
New Revision: 81376

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81376
Log:
Merged revisions 81373 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81373 | crichter | 2007-08-30 16:43:33 +0200 (Do, 30 Aug 2007) | 1 line

Fixed some warnings.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=81376&r1=81375&r2=81376
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Thu Aug 30 09:54:30 2007
@@ -2546,8 +2546,10 @@
 static struct ast_frame *misdn_read(struct ast_channel *ast)
 {
 	struct chan_list *tmp;
-	int len;
-	
+	fd_set rrfs;
+	struct timeval tv;
+	int len, t;
+
 	if (!ast) {
 		chan_misdn_log(1, 0, "misdn_read called without ast\n");
 		return NULL;
@@ -2562,15 +2564,13 @@
 		return NULL;
 	}
 
-	fd_set rrfs;
-	struct timeval tv;
 	tv.tv_sec=0;
 	tv.tv_usec=20000;
 
 	FD_ZERO(&rrfs);
 	FD_SET(tmp->pipe[0],&rrfs);
 
-	int t=select(FD_SETSIZE,&rrfs,NULL, NULL,&tv);
+	t=select(FD_SETSIZE,&rrfs,NULL, NULL,&tv);
 
 	if (!t) {
 		chan_misdn_log(3, tmp->bc->port, "read Select Timed out\n");