mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 03:13:44 +08:00
linux-user/syscall.c: clean up local variable shadowing in xattr syscalls
p is a generic variable in syscall() and can be used by any syscall case, so this patch removes the useless local variable declaration for the following syscalls: TARGET_NR_llistxattr, TARGET_NR_listxattr, TARGET_NR_setxattr, TARGET_NR_lsetxattr, TARGET_NR_getxattr, TARGET_NR_lgetxattr, TARGET_NR_removexattr, TARGET_NR_lremovexattr. Fix following warnings: .../linux-user/syscall.c:12342:15: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] 12342 | void *p, *b = 0; | ^ .../linux-user/syscall.c:8975:11: note: shadowed declaration is here 8975 | void *p; | ^ .../linux-user/syscall.c:12379:19: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] 12379 | void *p, *n, *v = 0; | ^ .../linux-user/syscall.c:8975:11: note: shadowed declaration is here 8975 | void *p; | ^ .../linux-user/syscall.c:12424:19: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] 12424 | void *p, *n, *v = 0; | ^ .../linux-user/syscall.c:8975:11: note: shadowed declaration is here 8975 | void *p; | ^ .../linux-user/syscall.c:12469:19: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] 12469 | void *p, *n; | ^ .../linux-user/syscall.c:8975:11: note: shadowed declaration is here 8975 | void *p; | ^ Signed-off-by: Laurent Vivier <laurent@vivier.eu> Message-ID: <20230925151029.461358-6-laurent@vivier.eu> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
9962b7c213
commit
77c9f177e0
@ -12339,7 +12339,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
case TARGET_NR_listxattr:
|
||||
case TARGET_NR_llistxattr:
|
||||
{
|
||||
void *p, *b = 0;
|
||||
void *b = 0;
|
||||
if (arg2) {
|
||||
b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
|
||||
if (!b) {
|
||||
@ -12376,7 +12376,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
case TARGET_NR_setxattr:
|
||||
case TARGET_NR_lsetxattr:
|
||||
{
|
||||
void *p, *n, *v = 0;
|
||||
void *n, *v = 0;
|
||||
if (arg3) {
|
||||
v = lock_user(VERIFY_READ, arg3, arg4, 1);
|
||||
if (!v) {
|
||||
@ -12421,7 +12421,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
case TARGET_NR_getxattr:
|
||||
case TARGET_NR_lgetxattr:
|
||||
{
|
||||
void *p, *n, *v = 0;
|
||||
void *n, *v = 0;
|
||||
if (arg3) {
|
||||
v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
|
||||
if (!v) {
|
||||
@ -12466,7 +12466,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
case TARGET_NR_removexattr:
|
||||
case TARGET_NR_lremovexattr:
|
||||
{
|
||||
void *p, *n;
|
||||
void *n;
|
||||
p = lock_user_string(arg1);
|
||||
n = lock_user_string(arg2);
|
||||
if (p && n) {
|
||||
|
Loading…
Reference in New Issue
Block a user