Make nasm_malloc() et al available from inside ndisasm

Clean up nasmlib to remove functions irrelevant for ndisasm; make
nasm_malloc() etc usable inside ndisasm.

1 files changed, 14 insertions, 0 deletions

diff --git a/ndisasm.c b/ndisasm.c
index f9793838..ea4dc537 100644
--- a/ndisasm.c
+++ b/ndisasm.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -36,6 +37,17 @@ static const char *help =
 static void output_ins(uint32_t, uint8_t *, int, char *);
 static void skip(uint32_t dist, FILE * fp);
 
+static void ndisasm_error(int severity, const char *fmt, ...)
+{
+    va_list va;
+
+    va_start(va, fmt);
+    vfprintf(stderr, fmt, va);
+
+    if (severity & ERR_FATAL)
+	exit(1);
+}
+
 int main(int argc, char **argv)
 {
     char buffer[INSN_MAX * 2], *p, *ep, *q;
@@ -53,6 +65,8 @@ int main(int argc, char **argv)
     int32_t offset;
     FILE *fp;
 
+    nasm_set_malloc_error(ndisasm_error);
+
     offset = 0;
     init_sync();