diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-11 13:10:04 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-11 13:10:04 +0000 |
| commit | a08f2af3f7325995166a9e88de078cf53503e56c (patch) | |
| tree | b080e4565c4727a7c3ad4753cef2a2d995dc4f43 /main/minimime | |
| parent | 73f2a87637d7373e9388046c8093416305c3d730 (diff) | |
(closes issue #10692)
Reported by: snuffy
Patches:
minivm.diff uploaded by snuffy (license 35)
Instead of using err (which is not available under Solaris) use fdprintf with stderr.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82231 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/minimime')
| -rw-r--r-- | main/minimime/minimime.c | 9 | ||||
| -rw-r--r-- | main/minimime/mm_mem.c | 5 | ||||
| -rw-r--r-- | main/minimime/tests/create.c | 1 | ||||
| -rw-r--r-- | main/minimime/tests/parse.c | 1 |
4 files changed, 6 insertions, 10 deletions
diff --git a/main/minimime/minimime.c b/main/minimime/minimime.c index f96b62fb1..1b324585c 100644 --- a/main/minimime/minimime.c +++ b/main/minimime/minimime.c @@ -38,7 +38,6 @@ #include <unistd.h> #include <fcntl.h> #include <getopt.h> -#include <err.h> #include "mm.h" @@ -106,20 +105,20 @@ main(int argc, char **argv) i = mm_parse_file(ctx, argv[0], MM_PARSE_LOOSE, 0); } else { if (stat(argv[0], &st) == -1) { - err(1, "stat"); + fprintf(stderr, "INFO: stat"); } if ((fd = open(argv[0], O_RDONLY)) == -1) { - err(1, "open"); + fdprintf(stderr, "INFO: open"); } buf = (char *)malloc(st.st_size); if (buf == NULL) { - err(1, "malloc"); + fdprintf(stderr, "INFO: malloc"); } if (read(fd, buf, st.st_size) != st.st_size) { - err(1, "read"); + fdprintf(stderr, "INFO: read"); } close(fd); diff --git a/main/minimime/mm_mem.c b/main/minimime/mm_mem.c index 91ad3b987..6c915e564 100644 --- a/main/minimime/mm_mem.c +++ b/main/minimime/mm_mem.c @@ -37,7 +37,6 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <err.h> #include <assert.h> #include "mm_internal.h" @@ -55,11 +54,11 @@ MM_malloc(size_t size, char *filename, int line) pointer = malloc(size); if (pointer == NULL) - err(1, "malloc"); + fdprintf(stderr, "INFO: malloc"); chunk = (struct MM_mem_chunk *)malloc(sizeof(struct MM_mem_chunk)); if (chunk == NULL) - err(1, "malloc"); + fdprintf(stderr, "INFO: malloc"); chunk->address = pointer; chunk->size = size; diff --git a/main/minimime/tests/create.c b/main/minimime/tests/create.c index a8ca479f1..c881f17f7 100644 --- a/main/minimime/tests/create.c +++ b/main/minimime/tests/create.c @@ -40,7 +40,6 @@ #include <unistd.h> #include <fcntl.h> #include <getopt.h> -#include <err.h> #include "mm.h" diff --git a/main/minimime/tests/parse.c b/main/minimime/tests/parse.c index 805bd2cb1..3d3bdf028 100644 --- a/main/minimime/tests/parse.c +++ b/main/minimime/tests/parse.c @@ -40,7 +40,6 @@ #include <unistd.h> #include <fcntl.h> #include <getopt.h> -#include <err.h> #include "mm.h" |