diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /lib/memory.c | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'lib/memory.c')
| -rw-r--r-- | lib/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/memory.c b/lib/memory.c index c684c7605c..90d7d420a9 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -132,7 +132,7 @@ static int qmem_exit_walker(void *arg, struct memgroup *mg, struct memtype *mt) int log_memstats(FILE *fp, const char *prefix) { - struct exit_dump_args eda = { .fp = fp, .prefix = prefix, .error = 0 }; + struct exit_dump_args eda = {.fp = fp, .prefix = prefix, .error = 0}; qmem_walk(qmem_exit_walker, &eda); return eda.error; } |