[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/20] bsd-user: style tweak: use {} for all if statements, format
From: |
Warner Losh |
Subject: |
[PULL 10/20] bsd-user: style tweak: use {} for all if statements, format else correctly |
Date: |
Wed, 12 May 2021 11:17:10 -0600 |
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/qemu.h | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 2494d9209d..8d3767964d 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -358,16 +358,18 @@ abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t
len);
static inline void *lock_user(int type, abi_ulong guest_addr, long len,
int copy)
{
- if (!access_ok(type, guest_addr, len))
+ if (!access_ok(type, guest_addr, len)) {
return NULL;
+ }
#ifdef DEBUG_REMAP
{
void *addr;
addr = g_malloc(len);
- if (copy)
+ if (copy) {
memcpy(addr, g2h_untagged(guest_addr), len);
- else
+ } else {
memset(addr, 0, len);
+ }
return addr;
}
#else
@@ -384,12 +386,15 @@ static inline void unlock_user(void *host_ptr, abi_ulong
guest_addr,
{
#ifdef DEBUG_REMAP
- if (!host_ptr)
+ if (!host_ptr) {
return;
- if (host_ptr == g2h_untagged(guest_addr))
+ }
+ if (host_ptr == g2h_untagged(guest_addr)) {
return;
- if (len > 0)
+ }
+ if (len > 0) {
memcpy(g2h_untagged(guest_addr), host_ptr, len);
+ }
g_free(host_ptr);
#endif
}
@@ -405,8 +410,9 @@ static inline void *lock_user_string(abi_ulong guest_addr)
{
abi_long len;
len = target_strlen(guest_addr);
- if (len < 0)
+ if (len < 0) {
return NULL;
+ }
return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1);
}
--
2.22.1
- [PULL 00/20] bsd-user style tweaks and start cleanup, Warner Losh, 2021/05/12
- [PULL 01/20] bsd-user: whitespace changes, Warner Losh, 2021/05/12
- [PULL 03/20] bsd-user: style tweak: Remove #if 0'd code, Warner Losh, 2021/05/12
- [PULL 02/20] bsd-user: style tweak: use C not C++ comments, Warner Losh, 2021/05/12
- [PULL 10/20] bsd-user: style tweak: use {} for all if statements, format else correctly,
Warner Losh <=
- [PULL 06/20] bsd-user: style tweak: move extern to header file, Warner Losh, 2021/05/12
- [PULL 07/20] bsd-user: style tweak: remove spacing after '*' and add after }, Warner Losh, 2021/05/12
- [PULL 09/20] bsd-user: style tweak: don't assign in if statements, Warner Losh, 2021/05/12
- [PULL 13/20] bsd-user: whitespace changes, Warner Losh, 2021/05/12
- [PULL 04/20] bsd-user: style tweak: Use preferred block comments, Warner Losh, 2021/05/12
- [PULL 05/20] bsd-user: Remove commented out code, Warner Losh, 2021/05/12
- [PULL 08/20] bsd-user: style tweak: Use preferred block comments, Warner Losh, 2021/05/12
- [PULL 15/20] bsd-user: style tweak: keyword space (, Warner Losh, 2021/05/12
- [PULL 11/20] bsd-user: style tweak: use {} consistently in for / if / else statements, Warner Losh, 2021/05/12
- [PULL 18/20] bsd-user: remove target_signal.h, it's unused, Warner Losh, 2021/05/12