[PATCH trivial] linux-user/syscall.c: replace function pointer with a helper macro for fcntl/flock case

[Michael Tokarev]

There's a slight difference in fcntl locking handling on arm and others:
arm has 2 variants of struct flock argument handling, with and without eabi.
For this reason, we currently take address of the conversion function into
a variable, and for arm without eabi case, assign a different conversion
function to this pointer.  All functions are declared as inline, - and for
an inline function, it is not clear how one can have an address of it at
all.

Instead of using a function pointer, use a macro, defined differently for
arm (with arithmetic if based on eabi presence) and for all other targets
(using regular argument conversion function directly).

While at it, replace tabs with spaces in nearby code.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 linux-user/syscall.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d418e2864a..786623d395 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6880,9 +6880,6 @@ static inline abi_long copy_to_user_flock(abi_ulong 
target_flock_addr,
     return 0;
 }
 
-typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
 #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
 struct target_oabi_flock64 {
     abi_short l_type;
@@ -12402,14 +12399,19 @@ static abi_long do_syscall1(CPUArchState *cpu_env, 
int num, abi_long arg1,
     {
         int cmd;
         struct flock fl;
-        from_flock64_fn *copyfrom = copy_from_user_flock64;
-        to_flock64_fn *copyto = copy_to_user_flock64;
 
 #ifdef TARGET_ARM
-        if (!cpu_env->eabi) {
-            copyfrom = copy_from_user_oabi_flock64;
-            copyto = copy_to_user_oabi_flock64;
-        }
+# define copyfrom(fl, arg) \
+           (cpu_env->eabi ? \
+             copy_from_user_flock64(fl, arg) : \
+             copy_from_user_oabi_flock64(fl, arg))
+# define copyto(arg, fl) \
+           (cpu_env->eabi ? \
+             copy_to_user_flock64(arg, fl) : \
+             copy_to_user_oabi_flock64(arg, fl))
+#else
+# define copyfrom copy_from_user_flock64
+# define copyto copy_to_user_flock64
 #endif
 
         cmd = target_to_host_fcntl_cmd(arg2);
@@ -12427,7 +12429,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int 
num, abi_long arg1,
             if (ret == 0) {
                 ret = copyto(arg3, &fl);
             }
-           break;
+            break;
 
         case TARGET_F_SETLK64:
         case TARGET_F_SETLKW64:
@@ -12436,10 +12438,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env, 
int num, abi_long arg1,
                 break;
             }
             ret = get_errno(safe_fcntl(arg1, cmd, &fl));
-           break;
+            break;
         default:
             ret = do_fcntl(arg1, arg2, arg3);
             break;
+#undef copyfrom
+#undef copyto
         }
         return ret;
     }
-- 
2.39.2