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

block/cloop: Fix coding style 

Fix coding style in block/cloop.c.

Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed_by: Ray Wang <raywang@linux.vnet.ibm.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Dong Xu Wang 2011-11-02 16:36:20 +08:00 committed by Kevin Wolf
parent acae6f1c4c
commit 5b47b7c3d3
1 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
block/cloop.c
View File

@ -44,10 +44,12 @@ static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename)
"#V2.0 Format\n" "#V2.0 Format\n"
"modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n"; "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n";
int length = strlen(magic_version_2_0); int length = strlen(magic_version_2_0);
if(length>buf_size) if (length > buf_size) {
length = buf_size; length = buf_size;
if(!memcmp(magic_version_2_0,buf,length)) }
if (!memcmp(magic_version_2_0, buf, length)) {
return 2; return 2;
}
return 0; return 0;
} }
@ -80,16 +82,18 @@ static int cloop_open(BlockDriverState *bs, int flags)
s->offsets[i] = be64_to_cpu(s->offsets[i]); s->offsets[i] = be64_to_cpu(s->offsets[i]);
if (i > 0) { if (i > 0) {
uint32_t size = s->offsets[i] - s->offsets[i - 1]; uint32_t size = s->offsets[i] - s->offsets[i - 1];
if(size>max_compressed_block_size) if (size > max_compressed_block_size) {
max_compressed_block_size = size; max_compressed_block_size = size;
} }
} }
}
/* initialize zlib engine */ /* initialize zlib engine */
s->compressed_block = g_malloc(max_compressed_block_size + 1); s->compressed_block = g_malloc(max_compressed_block_size + 1);
s->uncompressed_block = g_malloc(s->block_size); s->uncompressed_block = g_malloc(s->block_size);
if(inflateInit(&s->zstream) != Z_OK) if (inflateInit(&s->zstream) != Z_OK) {
goto cloop_close; goto cloop_close;
}
s->current_block = s->n_blocks; s->current_block = s->n_blocks;
s->sectors_per_block = s->block_size/512; s->sectors_per_block = s->block_size/512;
@ -111,19 +115,22 @@ static inline int cloop_read_block(BlockDriverState *bs, int block_num)
ret = bdrv_pread(bs->file, s->offsets[block_num], s->compressed_block, ret = bdrv_pread(bs->file, s->offsets[block_num], s->compressed_block,
bytes); bytes);
if (ret != bytes) if (ret != bytes) {
return -1; return -1;
}
s->zstream.next_in = s->compressed_block; s->zstream.next_in = s->compressed_block;
s->zstream.avail_in = bytes; s->zstream.avail_in = bytes;
s->zstream.next_out = s->uncompressed_block; s->zstream.next_out = s->uncompressed_block;
s->zstream.avail_out = s->block_size; s->zstream.avail_out = s->block_size;
ret = inflateReset(&s->zstream); ret = inflateReset(&s->zstream);
if(ret != Z_OK) if (ret != Z_OK) {
return -1; return -1;
}
ret = inflate(&s->zstream, Z_FINISH); ret = inflate(&s->zstream, Z_FINISH);
if(ret != Z_STREAM_END || s->zstream.total_out != s->block_size) if (ret != Z_STREAM_END || s->zstream.total_out != s->block_size) {
return -1; return -1;
}
s->current_block = block_num; s->current_block = block_num;
} }
@ -137,11 +144,14 @@ static int cloop_read(BlockDriverState *bs, int64_t sector_num,
int i; int i;
for (i = 0; i < nb_sectors; i++) { for (i = 0; i < nb_sectors; i++) {
uint32_t sector_offset_in_block=((sector_num+i)%s->sectors_per_block), uint32_t sector_offset_in_block =
((sector_num + i) % s->sectors_per_block),
block_num = (sector_num + i) / s->sectors_per_block; block_num = (sector_num + i) / s->sectors_per_block;
if(cloop_read_block(bs, block_num) != 0) if (cloop_read_block(bs, block_num) != 0) {
return -1; return -1;
memcpy(buf+i*512,s->uncompressed_block+sector_offset_in_block*512,512); }
memcpy(buf + i * 512,
s->uncompressed_block + sector_offset_in_block * 512, 512);
} }
return 0; return 0;
} }
@ -160,8 +170,9 @@ static coroutine_fn int cloop_co_read(BlockDriverState *bs, int64_t sector_num,
static void cloop_close(BlockDriverState *bs) static void cloop_close(BlockDriverState *bs)
{ {
BDRVCloopState *s = bs->opaque; BDRVCloopState *s = bs->opaque;
if(s->n_blocks>0) if (s->n_blocks > 0) {
free(s->offsets); free(s->offsets);
}
free(s->compressed_block); free(s->compressed_block);
free(s->uncompressed_block); free(s->uncompressed_block);
inflateEnd(&s->zstream); inflateEnd(&s->zstream);