* [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 13:38 ` ghorges
0 siblings, 0 replies; 6+ messages in thread
From: ghorges @ 2019-04-08 13:38 UTC (permalink / raw)
To: qemu-devel; +Cc: riku.voipio, laurent, ghorges, ghorges
From: ghorges <1298394633@qq.com>
Signed-off-by: ghorges <ghorges@xiyoulinux.org>
---
linux-user/syscall.c | 66 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 208fd1813d..985095e4d5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8240,7 +8240,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
size_t size;
} sig, *sig_ptr;
- abi_ulong arg_sigset, arg_sigsize, *arg7;
+ abi_ulong arg_sigset, arg_sigsize, *arg7s;
target_sigset_t *target_sigset;
n = arg1;
@@ -8280,13 +8280,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
sig_ptr = &sig;
sig.size = SIGSET_T_SIZE;
- arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
- if (!arg7) {
+ arg7s = lock_user(VERIFY_READ, arg6, sizeof(*arg7s) * 2, 1);
+ if (!arg7s) {
return -TARGET_EFAULT;
}
- arg_sigset = tswapal(arg7[0]);
- arg_sigsize = tswapal(arg7[1]);
- unlock_user(arg7, arg6, 0);
+ arg_sigset = tswapal(arg7s[0]);
+ arg_sigsize = tswapal(arg7s[1]);
+ unlock_user(arg7s, arg6, 0);
if (arg_sigset) {
sig.set = &set;
@@ -9479,14 +9479,14 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
}
case TARGET_NR_getcpu:
{
- unsigned cpu, node;
- ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL,
+ unsigned cpus, node;
+ ret = get_errno(sys_getcpu(arg1 ? &cpus : NULL,
arg2 ? &node : NULL,
NULL));
if (is_error(ret)) {
return ret;
}
- if (arg1 && put_user_u32(cpu, arg1)) {
+ if (arg1 && put_user_u32(cpus, arg1)) {
return -TARGET_EFAULT;
}
if (arg2 && put_user_u32(node, arg2)) {
@@ -10649,24 +10649,24 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_listxattr:
case TARGET_NR_llistxattr:
{
- void *p, *b = 0;
+ void *q, *b = 0;
if (arg2) {
b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
if (!b) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
- if (p) {
+ q = lock_user_string(arg1);
+ if (q) {
if (num == TARGET_NR_listxattr) {
- ret = get_errno(listxattr(p, b, arg3));
+ ret = get_errno(listxattr(q, b, arg3));
} else {
- ret = get_errno(llistxattr(p, b, arg3));
+ ret = get_errno(llistxattr(q, b, arg3));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(b, arg2, arg3);
return ret;
}
@@ -10686,25 +10686,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_setxattr:
case TARGET_NR_lsetxattr:
{
- void *p, *n, *v = 0;
+ void *q, *n, *v = 0;
if (arg3) {
v = lock_user(VERIFY_READ, arg3, arg4, 1);
if (!v) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_setxattr) {
- ret = get_errno(setxattr(p, n, v, arg4, arg5));
+ ret = get_errno(setxattr(q, n, v, arg4, arg5));
} else {
- ret = get_errno(lsetxattr(p, n, v, arg4, arg5));
+ ret = get_errno(lsetxattr(q, n, v, arg4, arg5));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
unlock_user(v, arg3, 0);
}
@@ -10731,25 +10731,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_getxattr:
case TARGET_NR_lgetxattr:
{
- void *p, *n, *v = 0;
+ void *q, *n, *v = 0;
if (arg3) {
v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
if (!v) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_getxattr) {
- ret = get_errno(getxattr(p, n, v, arg4));
+ ret = get_errno(getxattr(q, n, v, arg4));
} else {
- ret = get_errno(lgetxattr(p, n, v, arg4));
+ ret = get_errno(lgetxattr(q, n, v, arg4));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
unlock_user(v, arg3, arg4);
}
@@ -10776,19 +10776,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_removexattr:
case TARGET_NR_lremovexattr:
{
- void *p, *n;
- p = lock_user_string(arg1);
+ void *q, *n;
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_removexattr) {
- ret = get_errno(removexattr(p, n));
+ ret = get_errno(removexattr(q, n));
} else {
- ret = get_errno(lremovexattr(p, n));
+ ret = get_errno(lremovexattr(q, n));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
}
return ret;
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 13:38 ` ghorges
0 siblings, 0 replies; 6+ messages in thread
From: ghorges @ 2019-04-08 13:38 UTC (permalink / raw)
To: qemu-devel; +Cc: ghorges, riku.voipio, laurent, ghorges
From: ghorges <1298394633@qq.com>
Signed-off-by: ghorges <ghorges@xiyoulinux.org>
---
linux-user/syscall.c | 66 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 208fd1813d..985095e4d5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8240,7 +8240,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
size_t size;
} sig, *sig_ptr;
- abi_ulong arg_sigset, arg_sigsize, *arg7;
+ abi_ulong arg_sigset, arg_sigsize, *arg7s;
target_sigset_t *target_sigset;
n = arg1;
@@ -8280,13 +8280,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
sig_ptr = &sig;
sig.size = SIGSET_T_SIZE;
- arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
- if (!arg7) {
+ arg7s = lock_user(VERIFY_READ, arg6, sizeof(*arg7s) * 2, 1);
+ if (!arg7s) {
return -TARGET_EFAULT;
}
- arg_sigset = tswapal(arg7[0]);
- arg_sigsize = tswapal(arg7[1]);
- unlock_user(arg7, arg6, 0);
+ arg_sigset = tswapal(arg7s[0]);
+ arg_sigsize = tswapal(arg7s[1]);
+ unlock_user(arg7s, arg6, 0);
if (arg_sigset) {
sig.set = &set;
@@ -9479,14 +9479,14 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
}
case TARGET_NR_getcpu:
{
- unsigned cpu, node;
- ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL,
+ unsigned cpus, node;
+ ret = get_errno(sys_getcpu(arg1 ? &cpus : NULL,
arg2 ? &node : NULL,
NULL));
if (is_error(ret)) {
return ret;
}
- if (arg1 && put_user_u32(cpu, arg1)) {
+ if (arg1 && put_user_u32(cpus, arg1)) {
return -TARGET_EFAULT;
}
if (arg2 && put_user_u32(node, arg2)) {
@@ -10649,24 +10649,24 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_listxattr:
case TARGET_NR_llistxattr:
{
- void *p, *b = 0;
+ void *q, *b = 0;
if (arg2) {
b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
if (!b) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
- if (p) {
+ q = lock_user_string(arg1);
+ if (q) {
if (num == TARGET_NR_listxattr) {
- ret = get_errno(listxattr(p, b, arg3));
+ ret = get_errno(listxattr(q, b, arg3));
} else {
- ret = get_errno(llistxattr(p, b, arg3));
+ ret = get_errno(llistxattr(q, b, arg3));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(b, arg2, arg3);
return ret;
}
@@ -10686,25 +10686,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_setxattr:
case TARGET_NR_lsetxattr:
{
- void *p, *n, *v = 0;
+ void *q, *n, *v = 0;
if (arg3) {
v = lock_user(VERIFY_READ, arg3, arg4, 1);
if (!v) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_setxattr) {
- ret = get_errno(setxattr(p, n, v, arg4, arg5));
+ ret = get_errno(setxattr(q, n, v, arg4, arg5));
} else {
- ret = get_errno(lsetxattr(p, n, v, arg4, arg5));
+ ret = get_errno(lsetxattr(q, n, v, arg4, arg5));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
unlock_user(v, arg3, 0);
}
@@ -10731,25 +10731,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_getxattr:
case TARGET_NR_lgetxattr:
{
- void *p, *n, *v = 0;
+ void *q, *n, *v = 0;
if (arg3) {
v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
if (!v) {
return -TARGET_EFAULT;
}
}
- p = lock_user_string(arg1);
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_getxattr) {
- ret = get_errno(getxattr(p, n, v, arg4));
+ ret = get_errno(getxattr(q, n, v, arg4));
} else {
- ret = get_errno(lgetxattr(p, n, v, arg4));
+ ret = get_errno(lgetxattr(q, n, v, arg4));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
unlock_user(v, arg3, arg4);
}
@@ -10776,19 +10776,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_removexattr:
case TARGET_NR_lremovexattr:
{
- void *p, *n;
- p = lock_user_string(arg1);
+ void *q, *n;
+ q = lock_user_string(arg1);
n = lock_user_string(arg2);
- if (p && n) {
+ if (q && n) {
if (num == TARGET_NR_removexattr) {
- ret = get_errno(removexattr(p, n));
+ ret = get_errno(removexattr(q, n));
} else {
- ret = get_errno(lremovexattr(p, n));
+ ret = get_errno(lremovexattr(q, n));
}
} else {
ret = -TARGET_EFAULT;
}
- unlock_user(p, arg1, 0);
+ unlock_user(q, arg1, 0);
unlock_user(n, arg2, 0);
}
return ret;
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 13:45 ` Laurent Vivier
0 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2019-04-08 13:45 UTC (permalink / raw)
To: ghorges, qemu-devel; +Cc: riku.voipio, ghorges
Hi,
Le 08/04/2019 à 15:38, ghorges a écrit :
> From: ghorges <1298394633@qq.com>
Very weird. Perhaps you can update the author with "git commit --amend
--author='ghorges <ghorges@xiyoulinux.org>'" to have the same email address?
> Signed-off-by: ghorges <ghorges@xiyoulinux.org>
we need a description here with at least the problem you are trying to
fix (the error message from the compiler, for instance).
Thanks,
Laurent
> ---
> linux-user/syscall.c | 66 ++++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 208fd1813d..985095e4d5 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -8240,7 +8240,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> size_t size;
> } sig, *sig_ptr;
>
> - abi_ulong arg_sigset, arg_sigsize, *arg7;
> + abi_ulong arg_sigset, arg_sigsize, *arg7s;
> target_sigset_t *target_sigset;
>
> n = arg1;
> @@ -8280,13 +8280,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> sig_ptr = &sig;
> sig.size = SIGSET_T_SIZE;
>
> - arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
> - if (!arg7) {
> + arg7s = lock_user(VERIFY_READ, arg6, sizeof(*arg7s) * 2, 1);
> + if (!arg7s) {
> return -TARGET_EFAULT;
> }
> - arg_sigset = tswapal(arg7[0]);
> - arg_sigsize = tswapal(arg7[1]);
> - unlock_user(arg7, arg6, 0);
> + arg_sigset = tswapal(arg7s[0]);
> + arg_sigsize = tswapal(arg7s[1]);
> + unlock_user(arg7s, arg6, 0);
>
> if (arg_sigset) {
> sig.set = &set;
> @@ -9479,14 +9479,14 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> }
> case TARGET_NR_getcpu:
> {
> - unsigned cpu, node;
> - ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL,
> + unsigned cpus, node;
> + ret = get_errno(sys_getcpu(arg1 ? &cpus : NULL,
> arg2 ? &node : NULL,
> NULL));
> if (is_error(ret)) {
> return ret;
> }
> - if (arg1 && put_user_u32(cpu, arg1)) {
> + if (arg1 && put_user_u32(cpus, arg1)) {
> return -TARGET_EFAULT;
> }
> if (arg2 && put_user_u32(node, arg2)) {
> @@ -10649,24 +10649,24 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_listxattr:
> case TARGET_NR_llistxattr:
> {
> - void *p, *b = 0;
> + void *q, *b = 0;
> if (arg2) {
> b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
> if (!b) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> - if (p) {
> + q = lock_user_string(arg1);
> + if (q) {
> if (num == TARGET_NR_listxattr) {
> - ret = get_errno(listxattr(p, b, arg3));
> + ret = get_errno(listxattr(q, b, arg3));
> } else {
> - ret = get_errno(llistxattr(p, b, arg3));
> + ret = get_errno(llistxattr(q, b, arg3));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(b, arg2, arg3);
> return ret;
> }
> @@ -10686,25 +10686,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_setxattr:
> case TARGET_NR_lsetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_READ, arg3, arg4, 1);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_setxattr) {
> - ret = get_errno(setxattr(p, n, v, arg4, arg5));
> + ret = get_errno(setxattr(q, n, v, arg4, arg5));
> } else {
> - ret = get_errno(lsetxattr(p, n, v, arg4, arg5));
> + ret = get_errno(lsetxattr(q, n, v, arg4, arg5));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, 0);
> }
> @@ -10731,25 +10731,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_getxattr:
> case TARGET_NR_lgetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_getxattr) {
> - ret = get_errno(getxattr(p, n, v, arg4));
> + ret = get_errno(getxattr(q, n, v, arg4));
> } else {
> - ret = get_errno(lgetxattr(p, n, v, arg4));
> + ret = get_errno(lgetxattr(q, n, v, arg4));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, arg4);
> }
> @@ -10776,19 +10776,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_removexattr:
> case TARGET_NR_lremovexattr:
> {
> - void *p, *n;
> - p = lock_user_string(arg1);
> + void *q, *n;
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_removexattr) {
> - ret = get_errno(removexattr(p, n));
> + ret = get_errno(removexattr(q, n));
> } else {
> - ret = get_errno(lremovexattr(p, n));
> + ret = get_errno(lremovexattr(q, n));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> }
> return ret;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 13:45 ` Laurent Vivier
0 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2019-04-08 13:45 UTC (permalink / raw)
To: ghorges, qemu-devel; +Cc: ghorges, riku.voipio
Hi,
Le 08/04/2019 à 15:38, ghorges a écrit :
> From: ghorges <1298394633@qq.com>
Very weird. Perhaps you can update the author with "git commit --amend
--author='ghorges <ghorges@xiyoulinux.org>'" to have the same email address?
> Signed-off-by: ghorges <ghorges@xiyoulinux.org>
we need a description here with at least the problem you are trying to
fix (the error message from the compiler, for instance).
Thanks,
Laurent
> ---
> linux-user/syscall.c | 66 ++++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 208fd1813d..985095e4d5 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -8240,7 +8240,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> size_t size;
> } sig, *sig_ptr;
>
> - abi_ulong arg_sigset, arg_sigsize, *arg7;
> + abi_ulong arg_sigset, arg_sigsize, *arg7s;
> target_sigset_t *target_sigset;
>
> n = arg1;
> @@ -8280,13 +8280,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> sig_ptr = &sig;
> sig.size = SIGSET_T_SIZE;
>
> - arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
> - if (!arg7) {
> + arg7s = lock_user(VERIFY_READ, arg6, sizeof(*arg7s) * 2, 1);
> + if (!arg7s) {
> return -TARGET_EFAULT;
> }
> - arg_sigset = tswapal(arg7[0]);
> - arg_sigsize = tswapal(arg7[1]);
> - unlock_user(arg7, arg6, 0);
> + arg_sigset = tswapal(arg7s[0]);
> + arg_sigsize = tswapal(arg7s[1]);
> + unlock_user(arg7s, arg6, 0);
>
> if (arg_sigset) {
> sig.set = &set;
> @@ -9479,14 +9479,14 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> }
> case TARGET_NR_getcpu:
> {
> - unsigned cpu, node;
> - ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL,
> + unsigned cpus, node;
> + ret = get_errno(sys_getcpu(arg1 ? &cpus : NULL,
> arg2 ? &node : NULL,
> NULL));
> if (is_error(ret)) {
> return ret;
> }
> - if (arg1 && put_user_u32(cpu, arg1)) {
> + if (arg1 && put_user_u32(cpus, arg1)) {
> return -TARGET_EFAULT;
> }
> if (arg2 && put_user_u32(node, arg2)) {
> @@ -10649,24 +10649,24 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_listxattr:
> case TARGET_NR_llistxattr:
> {
> - void *p, *b = 0;
> + void *q, *b = 0;
> if (arg2) {
> b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
> if (!b) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> - if (p) {
> + q = lock_user_string(arg1);
> + if (q) {
> if (num == TARGET_NR_listxattr) {
> - ret = get_errno(listxattr(p, b, arg3));
> + ret = get_errno(listxattr(q, b, arg3));
> } else {
> - ret = get_errno(llistxattr(p, b, arg3));
> + ret = get_errno(llistxattr(q, b, arg3));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(b, arg2, arg3);
> return ret;
> }
> @@ -10686,25 +10686,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_setxattr:
> case TARGET_NR_lsetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_READ, arg3, arg4, 1);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_setxattr) {
> - ret = get_errno(setxattr(p, n, v, arg4, arg5));
> + ret = get_errno(setxattr(q, n, v, arg4, arg5));
> } else {
> - ret = get_errno(lsetxattr(p, n, v, arg4, arg5));
> + ret = get_errno(lsetxattr(q, n, v, arg4, arg5));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, 0);
> }
> @@ -10731,25 +10731,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_getxattr:
> case TARGET_NR_lgetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_getxattr) {
> - ret = get_errno(getxattr(p, n, v, arg4));
> + ret = get_errno(getxattr(q, n, v, arg4));
> } else {
> - ret = get_errno(lgetxattr(p, n, v, arg4));
> + ret = get_errno(lgetxattr(q, n, v, arg4));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, arg4);
> }
> @@ -10776,19 +10776,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_removexattr:
> case TARGET_NR_lremovexattr:
> {
> - void *p, *n;
> - p = lock_user_string(arg1);
> + void *q, *n;
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_removexattr) {
> - ret = get_errno(removexattr(p, n));
> + ret = get_errno(removexattr(q, n));
> } else {
> - ret = get_errno(lremovexattr(p, n));
> + ret = get_errno(lremovexattr(q, n));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> }
> return ret;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 14:26 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2019-04-08 14:26 UTC (permalink / raw)
To: ghorges; +Cc: QEMU Developers, ghorges, Riku Voipio, Laurent Vivier
On Mon, 8 Apr 2019 at 14:40, ghorges <ghorges@xiyoulinux.org> wrote:
>
> From: ghorges <1298394633@qq.com>
>
> Signed-off-by: ghorges <ghorges@xiyoulinux.org>
Hi; the name in a Signed-off-by: line should generally
be your full name (whatever you would use to sign
legal documents, etc). This looks like maybe it's your
login name or email address instead ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names
@ 2019-04-08 14:26 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2019-04-08 14:26 UTC (permalink / raw)
To: ghorges; +Cc: ghorges, Riku Voipio, QEMU Developers, Laurent Vivier
On Mon, 8 Apr 2019 at 14:40, ghorges <ghorges@xiyoulinux.org> wrote:
>
> From: ghorges <1298394633@qq.com>
>
> Signed-off-by: ghorges <ghorges@xiyoulinux.org>
Hi; the name in a Signed-off-by: line should generally
be your full name (whatever you would use to sign
legal documents, etc). This looks like maybe it's your
login name or email address instead ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-08 14:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-08 13:38 [Qemu-devel] [PATCH] Wshadow in qemu/linux-user/syscall.c:Changed some variable names ghorges
2019-04-08 13:38 ` ghorges
2019-04-08 13:45 ` Laurent Vivier
2019-04-08 13:45 ` Laurent Vivier
2019-04-08 14:26 ` Peter Maydell
2019-04-08 14:26 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.