libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Silenced compiler warnings of NetBSD and Solaris.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-05-20 12:19:37 +02:00
parent d09a317f51
commit cb519e221e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -38,7 +38,6 @@ libisofs-1.4.0.tar.gz Sun May 17 2014
iso_write_opts_set_prep_img(), iso_write_opts_set_efi_bootp(), iso_write_opts_set_prep_img(), iso_write_opts_set_efi_bootp(),
and iso_write_opts_set_partition_img(). and iso_write_opts_set_partition_img().
libisofs-1.3.8.tar.gz Sat Jun 28 2014 libisofs-1.3.8.tar.gz Sat Jun 28 2014
=============================================================================== ===============================================================================
* Bug fix: Prevent allocation of empty hash tables. Thanks Richard Nolde. * Bug fix: Prevent allocation of empty hash tables. Thanks Richard Nolde.

5
libisofs/ecma119.c
View File

@ -1562,7 +1562,7 @@ int iso_ivr_read_number(char *start_pt, char *end_pt, off_t *result, int flag)
txt[end_pt - start_pt] = 0; txt[end_pt - start_pt] = 0;
num = iso_scanf_io_size(start_pt, 1 | (flag & 2)); num = iso_scanf_io_size(start_pt, 1 | (flag & 2));
if (num < 0.0 || num > 0xffffffffffff) { if (num < 0.0 || num > 281474976710655.0) {
iso_msg_submit(-1, ISO_MALFORMED_READ_INTVL, 0, iso_msg_submit(-1, ISO_MALFORMED_READ_INTVL, 0,
"Negative or overly large number in interval reader description string"); "Negative or overly large number in interval reader description string");
return ISO_MALFORMED_READ_INTVL; return ISO_MALFORMED_READ_INTVL;
@ -1995,7 +1995,7 @@ int iso_write_partition_file(Ecma119Image *target, char *path,
off_t byte_count; off_t byte_count;
FILE *fp = NULL; FILE *fp = NULL;
uint32_t i, intvl_blocks; uint32_t i;
uint8_t *buf = NULL; uint8_t *buf = NULL;
int ret; int ret;
@ -2011,7 +2011,6 @@ int iso_write_partition_file(Ecma119Image *target, char *path,
&ivr, &byte_count, 0); &ivr, &byte_count, 0);
if (ret < 0) if (ret < 0)
goto ex; goto ex;
intvl_blocks = (byte_count + BLOCK_SIZE - 1) / BLOCK_SIZE;
for (i = 0; i < blocks; i++) { for (i = 0; i < blocks; i++) {
ret = iso_interval_reader_read(ivr, buf, &buf_fill, 0); ret = iso_interval_reader_read(ivr, buf, &buf_fill, 0);
if (ret < 0) if (ret < 0)