make MALLOC_DEBUG build work properly (issue #4970 with additional changes)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6379 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 8 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d2227b9bb..206b801e2 100755
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,11 @@ GREP=/usr/xpg4/bin/grep
 M4=/usr/local/bin/m4
 endif
 
+# if doing a recursive make, don't double-up CFLAGS
+ifeq ($(MAKECMDGOALS),ast_expr.a)
+CFLAGS=
+endif
+
 INCLUDE=-Iinclude -I../include
 CFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 CFLAGS+=$(OPTIMIZE)
diff --git a/astmm.c b/astmm.c
index 36b229f03..c3ec2b644 100755
--- a/astmm.c
+++ b/astmm.c
@@ -26,6 +26,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/lock.h"
+#include "asterisk/strings.h"
 
 #define SOME_PRIME 563
 
@@ -253,7 +254,7 @@ static int handle_show_memory(int fd, int argc, char *argv[])
 		reg = regions[x];
 		while (reg) {
 			if (!fn || !strcasecmp(fn, reg->file)) {
-				ast_cli(fd, "%10d bytes allocated in %20s at line %5d of %s\n", reg->len, reg->func, reg->lineno, reg->file);
+				ast_cli(fd, "%10d bytes allocated in %20s at line %5d of %s\n", (int) reg->len, reg->func, reg->lineno, reg->file);
 				len += reg->len;
 				count++;
 			}
@@ -357,7 +358,7 @@ void __ast_mm_init(void)
 	ast_cli_register(&show_memory_allocations_cli);
 	ast_cli_register(&show_memory_summary_cli);
 	
-	snprintf(filename, sizeof(filename), "%s/mmlog", (char *)ast_config_AST_LOG_DIR)
+	snprintf(filename, sizeof(filename), "%s/mmlog", (char *)ast_config_AST_LOG_DIR);
 	mmlog = fopen(filename, "a+");
 	if (option_verbose)
 		ast_verbose("Asterisk Malloc Debugger Started (see %s))\n", filename);