Skip to content

Commit

Permalink
block: Clean up local variable shadowing
Browse files Browse the repository at this point in the history 
Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: delete inner declarations when they are actually redundant,
else rename variables.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230921121312.1301864-7-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Sep 29, 2023
1 parent d25b99c commit fb2575f
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 26 deletions.
9 changes: 5 additions & 4 deletions block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3072,18 +3072,19 @@ bdrv_attach_child_common(BlockDriverState *child_bs,
&local_err);

if (ret < 0 && child_class->change_aio_ctx) {
Transaction *tran = tran_new();
Transaction *aio_ctx_tran = tran_new();
GHashTable *visited = g_hash_table_new(NULL, NULL);
bool ret_child;

g_hash_table_add(visited, new_child);
ret_child = child_class->change_aio_ctx(new_child, child_ctx,
visited, tran, NULL);
visited, aio_ctx_tran,
NULL);
if (ret_child == true) {
error_free(local_err);
ret = 0;
}
tran_finalize(tran, ret_child == true ? 0 : -1);
tran_finalize(aio_ctx_tran, ret_child == true ? 0 : -1);
g_hash_table_destroy(visited);
}

Expand Down Expand Up @@ -6208,12 +6209,12 @@ void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
QLIST_FOREACH(drv, &bdrv_drivers, list) {
if (drv->format_name) {
bool found = false;
int i = count;

if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, read_only)) {
continue;
}

i = count;
while (formats && i && !found) {
found = !strcmp(formats[--i], drv->format_name);
}
Expand Down
2 changes: 1 addition & 1 deletion block/rbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ static int coroutine_fn qemu_rbd_start_co(BlockDriverState *bs,
* operations that exceed the current size.
*/
if (offset + bytes > s->image_size) {
int r = qemu_rbd_resize(bs, offset + bytes);
r = qemu_rbd_resize(bs, offset + bytes);
if (r < 0) {
return r;
}
Expand Down
1 change: 0 additions & 1 deletion block/stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ void stream_start(const char *job_id, BlockDriverState *bs,
/* Make sure that the image is opened in read-write mode */
bs_read_only = bdrv_is_read_only(bs);
if (bs_read_only) {
int ret;
/* Hold the chain during reopen */
if (bdrv_freeze_backing_chain(bs, above_base, errp) < 0) {
return;
Expand Down
35 changes: 18 additions & 17 deletions block/vvfat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,6 @@ static int read_directory(BDRVVVFATState* s, int mapping_index)
while((entry=readdir(dir))) {
unsigned int length=strlen(dirname)+2+strlen(entry->d_name);
char* buffer;
direntry_t* direntry;
struct stat st;
int is_dot=!strcmp(entry->d_name,".");
int is_dotdot=!strcmp(entry->d_name,"..");
Expand Down Expand Up @@ -857,7 +856,7 @@ static int read_directory(BDRVVVFATState* s, int mapping_index)

/* fill with zeroes up to the end of the cluster */
while(s->directory.next%(0x10*s->sectors_per_cluster)) {
direntry_t* direntry=array_get_next(&(s->directory));
direntry = array_get_next(&(s->directory));
memset(direntry,0,sizeof(direntry_t));
}

Expand Down Expand Up @@ -1962,24 +1961,24 @@ get_cluster_count_for_direntry(BDRVVVFATState* s, direntry_t* direntry, const ch
* This is horribly inefficient, but that is okay, since
* it is rarely executed, if at all.
*/
int64_t offset = cluster2sector(s, cluster_num);
int64_t offs = cluster2sector(s, cluster_num);

vvfat_close_current_file(s);
for (i = 0; i < s->sectors_per_cluster; i++) {
int res;

res = bdrv_is_allocated(s->qcow->bs,
(offset + i) * BDRV_SECTOR_SIZE,
(offs + i) * BDRV_SECTOR_SIZE,
BDRV_SECTOR_SIZE, NULL);
if (res < 0) {
return -1;
}
if (!res) {
res = vvfat_read(s->bs, offset, s->cluster_buffer, 1);
res = vvfat_read(s->bs, offs, s->cluster_buffer, 1);
if (res) {
return -1;
}
res = bdrv_co_pwrite(s->qcow, offset * BDRV_SECTOR_SIZE,
res = bdrv_co_pwrite(s->qcow, offs * BDRV_SECTOR_SIZE,
BDRV_SECTOR_SIZE, s->cluster_buffer,
0);
if (res < 0) {
Expand Down Expand Up @@ -2467,8 +2466,9 @@ commit_direntries(BDRVVVFATState* s, int dir_index, int parent_mapping_index)

for (c = first_cluster; !fat_eof(s, c); c = modified_fat_get(s, c)) {
direntry_t *first_direntry;
void* direntry = array_get(&(s->directory), current_dir_index);
int ret = vvfat_read(s->bs, cluster2sector(s, c), direntry,

direntry = array_get(&(s->directory), current_dir_index);
ret = vvfat_read(s->bs, cluster2sector(s, c), (uint8_t *)direntry,
s->sectors_per_cluster);
if (ret)
return ret;
Expand Down Expand Up @@ -2690,12 +2690,12 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s)
direntry_t* direntry = array_get(&(s->directory),
mapping->info.dir.first_dir_index);
uint32_t c = mapping->begin;
int i = 0;
int j = 0;

/* recurse */
while (!fat_eof(s, c)) {
do {
direntry_t* d = direntry + i;
direntry_t *d = direntry + j;

if (is_file(d) || (is_directory(d) && !is_dot(d))) {
int l;
Expand All @@ -2716,8 +2716,8 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s)

schedule_rename(s, m->begin, new_path);
}
i++;
} while((i % (0x10 * s->sectors_per_cluster)) != 0);
j++;
} while (j % (0x10 * s->sectors_per_cluster) != 0);
c = fat_get(s, c);
}
}
Expand Down Expand Up @@ -2804,16 +2804,16 @@ static int coroutine_fn GRAPH_RDLOCK handle_commits(BDRVVVFATState* s)
int begin = commit->param.new_file.first_cluster;
mapping_t* mapping = find_mapping_for_cluster(s, begin);
direntry_t* entry;
int i;
int j;

/* find direntry */
for (i = 0; i < s->directory.next; i++) {
entry = array_get(&(s->directory), i);
for (j = 0; j < s->directory.next; j++) {
entry = array_get(&(s->directory), j);
if (is_file(entry) && begin_of_direntry(entry) == begin)
break;
}

if (i >= s->directory.next) {
if (j >= s->directory.next) {
fail = -6;
continue;
}
Expand All @@ -2833,8 +2833,9 @@ static int coroutine_fn GRAPH_RDLOCK handle_commits(BDRVVVFATState* s)
mapping->mode = MODE_NORMAL;
mapping->info.file.offset = 0;

if (commit_one_file(s, i, 0))
if (commit_one_file(s, j, 0)) {
fail = -7;
}

break;
}
Expand Down
6 changes: 3 additions & 3 deletions hw/block/xen-block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,16 +369,16 @@ static void xen_block_get_vdev(Object *obj, Visitor *v, const char *name,
case XEN_BLOCK_VDEV_TYPE_XVD:
case XEN_BLOCK_VDEV_TYPE_HD:
case XEN_BLOCK_VDEV_TYPE_SD: {
char *name = disk_to_vbd_name(vdev->disk);
char *vbd_name = disk_to_vbd_name(vdev->disk);

str = g_strdup_printf("%s%s%lu",
(vdev->type == XEN_BLOCK_VDEV_TYPE_XVD) ?
"xvd" :
(vdev->type == XEN_BLOCK_VDEV_TYPE_HD) ?
"hd" :
"sd",
name, vdev->partition);
g_free(name);
vbd_name, vdev->partition);
g_free(vbd_name);
break;
}
default:
Expand Down

0 comments on commit fb2575f

Please sign in to comment.