diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2021-01-04 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2021-01-04 08:00:00 +0000 |
| commit | 79316172d7e8dc0ae677a0c745797a06d56b53f4 (patch) | |
| tree | 3afed8f3f7f2e2ebfa105fa80a63594f40220a71 | |
| parent | 5af15448d3580950b463154fa3c5445b6179dd71 (diff) | |
| download | strace-79316172d7e8dc0ae677a0c745797a06d56b53f4.tar.gz | |
file_ioctl: rename to fs_f_ioctl
* Makefile.am (libstrace_a_SOURCES): Replace file_ioctl.c
with fs_f_ioctl.c.
* defs.h (DECL_IOCTL): Replace file with fs_f.
* file_ioctl.c: Rename to ...
* fs_f_ioctl.c: ... new file.
(file_ioctl): Rename to fs_f_ioctl.
* ioctl.c (ioctl_decode): Replace file_ioctl with fs_f_ioctl.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | defs.h | 2 | ||||
| -rw-r--r-- | fs_f_ioctl.c (renamed from file_ioctl.c) | 2 | ||||
| -rw-r--r-- | ioctl.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 78bb156ab..c0199f652 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,7 +114,6 @@ libstrace_a_SOURCES = \ fetch_struct_statfs.c \ fetch_struct_xfs_quotastat.c \ file_handle.c \ - file_ioctl.c \ filter.h \ filter_qualify.c \ filter_seccomp.c \ @@ -122,6 +121,7 @@ libstrace_a_SOURCES = \ flock.c \ flock.h \ fs_0x94_ioctl.c \ + fs_f_ioctl.c \ fs_x_ioctl.c \ fsconfig.c \ fsmount.c \ @@ -1209,8 +1209,8 @@ name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg) \ DECL_IOCTL(dm); DECL_IOCTL(evdev); -DECL_IOCTL(file); DECL_IOCTL(fs_0x94); +DECL_IOCTL(fs_f); DECL_IOCTL(fs_x); DECL_IOCTL(inotify); DECL_IOCTL(kvm); diff --git a/file_ioctl.c b/fs_f_ioctl.c index 86fae81a9..b8134570c 100644 --- a/file_ioctl.c +++ b/fs_f_ioctl.c @@ -73,7 +73,7 @@ decode_fiemap(struct tcb *const tcp, const kernel_ulong_t arg) } int -file_ioctl(struct tcb *const tcp, const unsigned int code, +fs_f_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ulong_t arg) { switch (code) { @@ -312,12 +312,12 @@ ioctl_decode(struct tcb *tcp) return fs_x_ioctl(tcp, code, arg); case 'f': { #if defined(ALPHA) || defined(POWERPC) - int ret = file_ioctl(tcp, code, arg); + int ret = fs_f_ioctl(tcp, code, arg); if (ret != RVAL_DECODED) return ret; return term_ioctl(tcp, code, arg); #else /* !(ALPHA || POWERPC) */ - return file_ioctl(tcp, code, arg); + return fs_f_ioctl(tcp, code, arg); #endif /* (ALPHA || POWERPC) */ } #ifdef HAVE_STRUCT_UBI_ATTACH_REQ_MAX_BEB_PER1024 |