Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-draft-ietf-grow-bgp-gshut-10

Conflicts:
	bgpd/bgp_route.c

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/memory.c b/lib/memory.c
index 0ccc204002..c684c7605c 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -104,6 +104,7 @@ int qmem_walk(qmem_walk_fn *func, void *arg)
 }
 
 struct exit_dump_args {
+	FILE *fp;
 	const char *prefix;
 	int error;
 };
@@ -113,7 +114,7 @@ static int qmem_exit_walker(void *arg, struct memgroup *mg, struct memtype *mt)
 	struct exit_dump_args *eda = arg;
 
 	if (!mt) {
-		fprintf(stderr,
+		fprintf(eda->fp,
 			"%s: showing active allocations in "
 			"memory group %s\n",
 			eda->prefix, mg->name);
@@ -122,15 +123,16 @@ static int qmem_exit_walker(void *arg, struct memgroup *mg, struct memtype *mt)
 		char size[32];
 		eda->error++;
 		snprintf(size, sizeof(size), "%10zu", mt->size);
-		fprintf(stderr, "%s: memstats:  %-30s: %6zu * %s\n",
+		fprintf(eda->fp, "%s: memstats:  %-30s: %6zu * %s\n",
 			eda->prefix, mt->name, mt->n_alloc,
 			mt->size == SIZE_VAR ? "(variably sized)" : size);
 	}
 	return 0;
 }
 
-void log_memstats_stderr(const char *prefix)
+int log_memstats(FILE *fp, const char *prefix)
 {
-	struct exit_dump_args eda = {.prefix = prefix, .error = 0};
+	struct exit_dump_args eda = { .fp = fp, .prefix = prefix, .error = 0 };
 	qmem_walk(qmem_exit_walker, &eda);
+	return eda.error;
 }