[v2] bsd-user style and reorg patches

[PATCH v2 37/48] bsd-user: style tweak: don't assign in if statements

Posted by imp@bsdimp.com 4 years, 9 months ago

From: Warner Losh <imp@bsdimp.com>

Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/uaccess.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bsd-user/uaccess.c b/bsd-user/uaccess.c
index 7eb4546fed..aab5e995a9 100644
--- a/bsd-user/uaccess.c
+++ b/bsd-user/uaccess.c
@@ -14,7 +14,8 @@ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len)
     abi_long ret = 0;
     void *ghptr;
 
-    if ((ghptr = lock_user(VERIFY_READ, gaddr, len, 1))) {
+    ghptr = lock_user(VERIFY_READ, gaddr, len, 1);
+    if (ghptr) {
         memcpy(hptr, ghptr, len);
         unlock_user(ghptr, gaddr, 0);
     } else
@@ -29,7 +30,8 @@ abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len)
     abi_long ret = 0;
     void *ghptr;
 
-    if ((ghptr = lock_user(VERIFY_WRITE, gaddr, len, 0))) {
+    ghptr = lock_user(VERIFY_WRITE, gaddr, len, 0);
+    if (ghptr) {
         memcpy(ghptr, hptr, len);
         unlock_user(ghptr, gaddr, len);
     } else
-- 
2.22.1

Re: [PATCH v2 37/48] bsd-user: style tweak: don't assign in if statements

Posted by Richard Henderson 4 years, 9 months ago

On 4/24/21 9:00 AM, imp@bsdimp.com wrote:
> From: Warner Losh<imp@bsdimp.com>
> 
> Signed-off-by: Warner Losh<imp@bsdimp.com>
> ---
>   bsd-user/uaccess.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~