From 63f28dd197b4ee53b6c542fe423b12943855a045 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sat, 6 Dec 2014 03:53:16 +0000
Subject: [PATCH] file.c: move fadvise64 and fadvise64_64 parsers to a separate
 file

* fadvise.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* file.c: Move sys_fadvise64, sys_fadvise64_64, and related code
to fadvise.c.
---
 Makefile.am |  1 +
 fadvise.c   | 35 +++++++++++++++++++++++++++++++++++
 file.c      | 32 --------------------------------
 3 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 fadvise.c

diff --git a/Makefile.am b/Makefile.am
index d197ef45..025b5e0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ strace_SOURCES =	\
 	count.c		\
 	desc.c		\
 	dirent.c	\
+	fadvise.c	\
 	fallocate.c	\
 	fanotify.c	\
 	file.c		\
diff --git a/fadvise.c b/fadvise.c
new file mode 100644
index 00000000..850a4250
--- /dev/null
+++ b/fadvise.c
@@ -0,0 +1,35 @@
+#include "defs.h"
+
+#include <fcntl.h>
+
+#include "xlat/advise.h"
+
+int
+sys_fadvise64(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		argn = printllval(tcp, ", %lld", 1);
+		tprintf(", %ld, ", tcp->u_arg[argn++]);
+		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
+	}
+	return 0;
+}
+
+int
+sys_fadvise64_64(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		argn = printllval(tcp, ", %lld, ", 1);
+		argn = printllval(tcp, "%lld, ", argn);
+#if defined __ARM_EABI__ || defined AARCH64 || defined POWERPC || defined XTENSA
+		printxval(advise, tcp->u_arg[1], "POSIX_FADV_???");
+#else
+		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
+#endif
+	}
+	return 0;
+}
diff --git a/file.c b/file.c
index 31eda57f..b61ed06c 100644
--- a/file.c
+++ b/file.c
@@ -1851,35 +1851,3 @@ sys_fremovexattr(struct tcb *tcp)
 	}
 	return 0;
 }
-
-#include "xlat/advise.h"
-
-int
-sys_fadvise64(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		int argn;
-		printfd(tcp, tcp->u_arg[0]);
-		argn = printllval(tcp, ", %lld", 1);
-		tprintf(", %ld, ", tcp->u_arg[argn++]);
-		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
-	}
-	return 0;
-}
-
-int
-sys_fadvise64_64(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		int argn;
-		printfd(tcp, tcp->u_arg[0]);
-		argn = printllval(tcp, ", %lld, ", 1);
-		argn = printllval(tcp, "%lld, ", argn);
-#if defined __ARM_EABI__ || defined AARCH64 || defined POWERPC || defined XTENSA
-		printxval(advise, tcp->u_arg[1], "POSIX_FADV_???");
-#else
-		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
-#endif
-	}
-	return 0;
-}
-- 
2.40.0