diff options
| author | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 19:37:29 +0000 |
|---|---|---|
| committer | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 19:37:29 +0000 |
| commit | 8715f10bee9112e24c40b2b525be531d3649f033 (patch) | |
| tree | d764b4005a01c91cd326d007f6f19c2d2c9b583d /channels/chan_iax2.c | |
| parent | 4950f5af8269efdc44a30f9a2809fb99c78409a4 (diff) | |
Merged revisions 189419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189419 | dbailey | 2009-04-20 14:28:16 -0500 (Mon, 20 Apr 2009) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@189421 f38db490-d61c-443f-a65b-d21fe96a405b
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 c0163b8d7..f8ef357a1 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2045,7 +2045,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; |