diff options
| author | Mark Spencer <markster@digium.com> | 2003-12-27 23:46:19 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2003-12-27 23:46:19 +0000 |
| commit | 148edfcf2652990d2da04e76fa75513597b5905d (patch) | |
| tree | 90a5dcfd67f35b0b4bad389c273cd2407a2d17b8 | |
| parent | b7bd21bc0aae0587f3e3008bd3b87bcec87d1844 (diff) | |
Ignore signals in select, fix typo in last patch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1884 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rwxr-xr-x | apps/app_agi.c | 2 | ||||
| -rwxr-xr-x | channels/chan_modem.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_agi.c b/apps/app_agi.c index 8ca56f42a..2dc6981d4 100755 --- a/apps/app_agi.c +++ b/apps/app_agi.c @@ -169,7 +169,7 @@ static int launch_script(char *script, char *args, int *fds, int *efd, int *opid close(fromast[0]); // [PHM 12/18/03] - close(audio[0]) + close(audio[0]); *opid = pid; return 0; diff --git a/channels/chan_modem.c b/channels/chan_modem.c index 48571af3e..09451decd 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -614,7 +614,8 @@ static void *do_monitor(void *data) pthread_testcancel(); /* Okay, select has finished. Let's see what happened. */ if (res < 1) { - ast_log(LOG_WARNING, "select return %d: %s\n", res, strerror(errno)); + if ((errno != EINTR) && (errno != EAGAIN)) + ast_log(LOG_WARNING, "select return %d: %s\n", res, strerror(errno)); continue; } /* Alright, lock the interface list again, and let's look and see what has |