From 078ecf40499d26a100c76e5078a039de47f3f797 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Fri, 17 Nov 2017 17:47:53 +0000
Subject: [PATCH] mem: move printing of mmap_flags to a separate function

* mem.c (print_mmap_flags): New function.
(print_mmap, SYS_FUNC(remap_file_pages)): Use it.
---
 mem.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/mem.c b/mem.c
index 00f5610d..04fae182 100644
--- a/mem.c
+++ b/mem.c
@@ -55,6 +55,17 @@ SYS_FUNC(brk)
 #include "xlat/mmap_prot.h"
 #include "xlat/mmap_flags.h"
 
+static void
+print_mmap_flags(kernel_ulong_t flags)
+{
+#ifdef MAP_TYPE
+	printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
+	addflags(mmap_flags, flags & ~MAP_TYPE);
+#else
+	printflags64(mmap_flags, flags, "MAP_???");
+#endif
+}
+
 static void
 print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
 {
@@ -68,12 +79,7 @@ print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
 	tprintf(", %" PRI_klu ", ", len);
 	printflags64(mmap_prot, prot, "PROT_???");
 	tprints(", ");
-#ifdef MAP_TYPE
-	printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
-	addflags(mmap_flags, flags & ~MAP_TYPE);
-#else
-	printflags64(mmap_flags, flags, "MAP_???");
-#endif
+	print_mmap_flags(flags);
 	tprints(", ");
 	printfd(tcp, fd);
 	tprintf(", %#llx", offset);
@@ -317,12 +323,7 @@ SYS_FUNC(remap_file_pages)
 	tprintf(", %" PRI_klu ", ", size);
 	printflags64(mmap_prot, prot, "PROT_???");
 	tprintf(", %" PRI_klu ", ", pgoff);
-#ifdef MAP_TYPE
-	printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
-	addflags(mmap_flags, flags & ~MAP_TYPE);
-#else
-	printflags64(mmap_flags, flags, "MAP_???");
-#endif
+	print_mmap_flags(flags);
 
 	return RVAL_DECODED;
 }