From df04684a2ca30e1fa9cd7eaa7714de3627141587 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Thu, 30 Aug 2007 14:54:30 +0000 Subject: [PATCH] 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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81376 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_misdn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 4b1abbb107..f56ff99d9b 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2546,8 +2546,10 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame 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 @@ static struct ast_frame *misdn_read(struct ast_channel *ast) 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");