diff options
| author | Doug Bailey <dbailey@digium.com> | 2009-04-20 19:28:16 +0000 |
|---|---|---|
| committer | Doug Bailey <dbailey@digium.com> | 2009-04-20 19:28:16 +0000 |
| commit | 9c2ff7bb1e5f7d80e273653e06b85a6cb69ef086 (patch) | |
| tree | b1ce940e024c4d369b0c73870b62ebbfc0850f79 /channels/chan_iax2.c | |
| parent | b5b18b781025872e066b5244951365e657b7d41c (diff) | |
Merged revisions 189391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189391 | dbailey | 2009-04-20 14:10:56 -0500 (Mon, 20 Apr 2009) | 4 lines
Clean up problem with manager implementation of mmap where it was not testing against MAP_FAILED response.
Got rid of shadowed variable used in processign the mmap results.
Change test of mmap results to compare against MAP_FAILED
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@189419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index fd71e3acc..e07858fe1 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2200,7 +2200,7 @@ static int try_firmware(char *s) return -1; } fwh = (struct ast_iax2_firmware_header*)mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (fwh == (void *) -1) { + if (fwh == MAP_FAILED) { ast_log(LOG_WARNING, "mmap failed: %s\n", strerror(errno)); close(fd); return -1; |