From cb519e221e3ced6d8332c8e956665c0d64b998d6 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 20 May 2015 12:19:37 +0200 Subject: [PATCH] Silenced compiler warnings of NetBSD and Solaris. --- ChangeLog | 1 - libisofs/ecma119.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aaa2a8e..69b29e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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(), and iso_write_opts_set_partition_img(). - libisofs-1.3.8.tar.gz Sat Jun 28 2014 =============================================================================== * Bug fix: Prevent allocation of empty hash tables. Thanks Richard Nolde. diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index fb43c3c..992e4dd 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -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; 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, "Negative or overly large number in interval reader description string"); return ISO_MALFORMED_READ_INTVL; @@ -1995,7 +1995,7 @@ int iso_write_partition_file(Ecma119Image *target, char *path, off_t byte_count; FILE *fp = NULL; - uint32_t i, intvl_blocks; + uint32_t i; uint8_t *buf = NULL; int ret; @@ -2011,7 +2011,6 @@ int iso_write_partition_file(Ecma119Image *target, char *path, &ivr, &byte_count, 0); if (ret < 0) goto ex; - intvl_blocks = (byte_count + BLOCK_SIZE - 1) / BLOCK_SIZE; for (i = 0; i < blocks; i++) { ret = iso_interval_reader_read(ivr, buf, &buf_fill, 0); if (ret < 0)