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.

diff --git a/Makefile.am b/Makefile.am
index d197ef45925d704dec2358b2210ca4da9625655e..025b5e0c56ecaebc2bae2ce0377f76bd67cd48d2 100644 (file)
--- 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 (file)
index 0000000..850a425
--- /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 31eda57f029657ab29b12c164a0d982902509ac2..b61ed06c3b5dc952f342b0a738dcbe75e6752b0c 100644 (file)
--- 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;
-}