From a7d3a24fa5e3e99be4b07eeeea3e61afc06c4633 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 11 Sep 2007 13:10:04 +0000 Subject: [PATCH] (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: https://origsvn.digium.com/svn/asterisk/trunk@82231 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/minimime/minimime.c | 9 ++++----- main/minimime/mm_mem.c | 5 ++--- main/minimime/tests/create.c | 1 - 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 f96b62fb11..1b324585ce 100644 --- a/main/minimime/minimime.c +++ b/main/minimime/minimime.c @@ -38,7 +38,6 @@ #include #include #include -#include #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 91ad3b987f..6c915e5649 100644 --- a/main/minimime/mm_mem.c +++ b/main/minimime/mm_mem.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #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 a8ca479f14..c881f17f78 100644 --- a/main/minimime/tests/create.c +++ b/main/minimime/tests/create.c @@ -40,7 +40,6 @@ #include #include #include -#include #include "mm.h" diff --git a/main/minimime/tests/parse.c b/main/minimime/tests/parse.c index 805bd2cb18..3d3bdf0284 100644 --- a/main/minimime/tests/parse.c +++ b/main/minimime/tests/parse.c @@ -40,7 +40,6 @@ #include #include #include -#include #include "mm.h"