Reacted on -Wextra -Wno-unused-parameter warnings of gcc for ecma119.c

This commit is contained in:
Thomas Schmitt 2011-05-21 23:09:44 +02:00
parent 99f037e210
commit b51232fef4
1 changed files with 9 additions and 8 deletions

View File

@ -1229,7 +1229,7 @@ int write_head_part1(Ecma119Image *target, int *write_count, int flag)
/* write volume descriptors, one per writer */ /* write volume descriptors, one per writer */
iso_msg_debug(target->image->id, "Write volume descriptors"); iso_msg_debug(target->image->id, "Write volume descriptors");
for (i = 0; i < target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i]; writer = target->writers[i];
res = writer->write_vol_desc(writer); res = writer->write_vol_desc(writer);
if (res < 0) if (res < 0)
@ -1266,7 +1266,8 @@ int write_head_part2(Ecma119Image *target, int *write_count, int flag)
/* Write multi-session padding up to target->partition_offset + 16 */ /* Write multi-session padding up to target->partition_offset + 16 */
memset(buf, 0, BLOCK_SIZE); memset(buf, 0, BLOCK_SIZE);
for(; *write_count < target->partition_offset + 16; (*write_count)++) { for(; *write_count < (int) target->partition_offset + 16;
(*write_count)++) {
res = iso_write(target, buf, BLOCK_SIZE); res = iso_write(target, buf, BLOCK_SIZE);
if (res < 0) if (res < 0)
goto write_error; goto write_error;
@ -1276,7 +1277,7 @@ int write_head_part2(Ecma119Image *target, int *write_count, int flag)
target->partiton_offset from any LBA pointer. target->partiton_offset from any LBA pointer.
*/ */
target->eff_partition_offset = target->partition_offset; target->eff_partition_offset = target->partition_offset;
for (i = 0; i < target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i]; writer = target->writers[i];
/* Not all writers have an entry in the partion volume descriptor set. /* Not all writers have an entry in the partion volume descriptor set.
It must be guaranteed that they write exactly one block. It must be guaranteed that they write exactly one block.
@ -1412,7 +1413,7 @@ void *write_function(void *arg)
goto write_error; goto write_error;
/* write data for each writer */ /* write data for each writer */
for (i = 0; i < target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i]; writer = target->writers[i];
res = writer->write_data(writer); res = writer->write_data(writer);
if (res < 0) { if (res < 0) {
@ -1469,10 +1470,10 @@ void *write_function(void *arg)
#endif #endif
write_error: ; write_error: ;
if (res != ISO_LIBJTE_END_FAILED) if (res != (int) ISO_LIBJTE_END_FAILED)
finish_libjte(target); finish_libjte(target);
target->eff_partition_offset = 0; target->eff_partition_offset = 0;
if (res == ISO_CANCELED) { if (res == (int) ISO_CANCELED) {
/* canceled */ /* canceled */
if (!target->will_cancel) if (!target->will_cancel)
iso_msg_submit(target->image->id, ISO_IMAGE_WRITE_CANCELED, iso_msg_submit(target->image->id, ISO_IMAGE_WRITE_CANCELED,
@ -1949,7 +1950,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
target->curblock = target->ms_block + target->partition_offset + 16; target->curblock = target->ms_block + target->partition_offset + 16;
/* Account for partition tree volume descriptors */ /* Account for partition tree volume descriptors */
for (i = 0; i < target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
/* Not all writers have an entry in the partition /* Not all writers have an entry in the partition
volume descriptor set. volume descriptor set.
*/ */
@ -1975,7 +1976,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
* That function computes the size needed by its structures and * That function computes the size needed by its structures and
* increments image current block propertly. * increments image current block propertly.
*/ */
for (i = 0; i < target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
IsoImageWriter *writer = target->writers[i]; IsoImageWriter *writer = target->writers[i];
/* Delaying boot image patching until new LBA is known */ /* Delaying boot image patching until new LBA is known */