Merge pull request #7220 from idryzhov/fix-clear-isis

[mirror_frr.git] / lib / memory.c

diff --git a/lib/memory.c b/lib/memory.c
index 149e294d500108f52af0f1172fbe5137e763d42c..2c902d123b5826bffe85701047e435eec77195db 100644 (file)
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -157,13 +157,13 @@ static int qmem_exit_walker(void *arg, struct memgroup *mg, struct memtype *mt)
 
        if (!mt) {
                fprintf(eda->fp,
-                       "%s: showing active allocations in "
-                       "memory group %s\n",
+                       "%s: showing active allocations in memory group %s\n",
                        eda->prefix, mg->name);
 
        } else if (mt->n_alloc) {
                char size[32];
-               eda->error++;
+               if (!mg->active_at_exit)
+                       eda->error++;
                snprintf(size, sizeof(size), "%10zu", mt->size);
                fprintf(eda->fp, "%s: memstats:  %-30s: %6zu * %s\n",
                        eda->prefix, mt->name, mt->n_alloc,