ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/syscall.c: clean up local variable shadowing in do_ioctl_dm() 

Fix following warnings:

.../linux-user/syscall.c: In function 'do_ioctl_dm':
.../linux-user/syscall.c:5053:23: warning: declaration of 'arg_type' shadows a previous local [-Wshadow=local]
 5053 |         const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) };
      |                       ^~~~~~~~
.../linux-user/syscall.c:4991:20: note: shadowed declaration is here
 4991 |     const argtype *arg_type = ie->arg_type;
      |                    ^~~~~~~~
...//linux-user/syscall.c:5102:27: warning: declaration of 'arg_type' shadows a previous local [-Wshadow=local]
 5102 |             const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_name_list) };
      |                           ^~~~~~~~
.../linux-user/syscall.c:4991:20: note: shadowed declaration is here
 4991 |     const argtype *arg_type = ie->arg_type;
      |                    ^~~~~~~~
.../linux-user/syscall.c:5130:27: warning: declaration of 'arg_type' shadows a previous local [-Wshadow=local]
 5130 |             const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) };
      |                           ^~~~~~~~
.../linux-user/syscall.c:4991:20: note: shadowed declaration is here
 4991 |     const argtype *arg_type = ie->arg_type;
      |                    ^~~~~~~~
.../linux-user/syscall.c:5170:27: warning: declaration of 'arg_type' shadows a previous local [-Wshadow=local]
 5170 |             const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_versions) };
      |                           ^~~~~~~~
.../linux-user/syscall.c:4991:20: note: shadowed declaration is here
 4991 |     const argtype *arg_type = ie->arg_type;
      |                    ^~~~~~~~

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20230925151029.461358-4-laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Laurent Vivier 2023-09-25 17:10:27 +02:00 committed by Markus Armbruster
parent ea80003315
commit eb2929ca50
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linux-user/syscall.c
View File

@ -5050,8 +5050,8 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
{ {
void *gspec = argptr; void *gspec = argptr;
void *cur_data = host_data; void *cur_data = host_data;
const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) }; const argtype dm_arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) };
int spec_size = thunk_type_size(arg_type, 0); int spec_size = thunk_type_size(dm_arg_type, 0);
int i; int i;
for (i = 0; i < host_dm->target_count; i++) { for (i = 0; i < host_dm->target_count; i++) {
@ -5059,7 +5059,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
uint32_t next; uint32_t next;
int slen; int slen;
thunk_convert(spec, gspec, arg_type, THUNK_HOST); thunk_convert(spec, gspec, dm_arg_type, THUNK_HOST);
slen = strlen((char*)gspec + spec_size) + 1; slen = strlen((char*)gspec + spec_size) + 1;
next = spec->next; next = spec->next;
spec->next = sizeof(*spec) + slen; spec->next = sizeof(*spec) + slen;
@ -5099,7 +5099,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
struct dm_name_list *nl = (void*)host_dm + host_dm->data_start; struct dm_name_list *nl = (void*)host_dm + host_dm->data_start;
uint32_t remaining_data = guest_data_size; uint32_t remaining_data = guest_data_size;
void *cur_data = argptr; void *cur_data = argptr;
const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_name_list) }; const argtype dm_arg_type[] = { MK_STRUCT(STRUCT_dm_name_list) };
int nl_size = 12; /* can't use thunk_size due to alignment */ int nl_size = 12; /* can't use thunk_size due to alignment */
while (1) { while (1) {
@ -5111,7 +5111,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
host_dm->flags |= DM_BUFFER_FULL_FLAG; host_dm->flags |= DM_BUFFER_FULL_FLAG;
break; break;
} }
thunk_convert(cur_data, nl, arg_type, THUNK_TARGET); thunk_convert(cur_data, nl, dm_arg_type, THUNK_TARGET);
strcpy(cur_data + nl_size, nl->name); strcpy(cur_data + nl_size, nl->name);
cur_data += nl->next; cur_data += nl->next;
remaining_data -= nl->next; remaining_data -= nl->next;
@ -5127,8 +5127,8 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
{ {
struct dm_target_spec *spec = (void*)host_dm + host_dm->data_start; struct dm_target_spec *spec = (void*)host_dm + host_dm->data_start;
void *cur_data = argptr; void *cur_data = argptr;
const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) }; const argtype dm_arg_type[] = { MK_STRUCT(STRUCT_dm_target_spec) };
int spec_size = thunk_type_size(arg_type, 0); int spec_size = thunk_type_size(dm_arg_type, 0);
int i; int i;
for (i = 0; i < host_dm->target_count; i++) { for (i = 0; i < host_dm->target_count; i++) {
@ -5139,7 +5139,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
host_dm->flags |= DM_BUFFER_FULL_FLAG; host_dm->flags |= DM_BUFFER_FULL_FLAG;
break; break;
} }
thunk_convert(cur_data, spec, arg_type, THUNK_TARGET); thunk_convert(cur_data, spec, dm_arg_type, THUNK_TARGET);
strcpy(cur_data + spec_size, (char*)&spec[1]); strcpy(cur_data + spec_size, (char*)&spec[1]);
cur_data = argptr + spec->next; cur_data = argptr + spec->next;
spec = (void*)host_dm + host_dm->data_start + next; spec = (void*)host_dm + host_dm->data_start + next;
@ -5167,8 +5167,8 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
struct dm_target_versions *vers = (void*)host_dm + host_dm->data_start; struct dm_target_versions *vers = (void*)host_dm + host_dm->data_start;
uint32_t remaining_data = guest_data_size; uint32_t remaining_data = guest_data_size;
void *cur_data = argptr; void *cur_data = argptr;
const argtype arg_type[] = { MK_STRUCT(STRUCT_dm_target_versions) }; const argtype dm_arg_type[] = { MK_STRUCT(STRUCT_dm_target_versions) };
int vers_size = thunk_type_size(arg_type, 0); int vers_size = thunk_type_size(dm_arg_type, 0);
while (1) { while (1) {
uint32_t next = vers->next; uint32_t next = vers->next;
@ -5179,7 +5179,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
host_dm->flags |= DM_BUFFER_FULL_FLAG; host_dm->flags |= DM_BUFFER_FULL_FLAG;
break; break;
} }
thunk_convert(cur_data, vers, arg_type, THUNK_TARGET); thunk_convert(cur_data, vers, dm_arg_type, THUNK_TARGET);
strcpy(cur_data + vers_size, vers->name); strcpy(cur_data + vers_size, vers->name);
cur_data += vers->next; cur_data += vers->next;
remaining_data -= vers->next; remaining_data -= vers->next;