From 49784243283a01dc314ae902ff23deacf3171c65 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 30 Apr 2010 11:36:14 +0200 Subject: [PATCH] Corrected calls of functions iso_lsb(), iso_msb(), iso_bb() which used integer types other than uint32_t. --- libisofs/ecma119.c | 8 ++++---- libisofs/iso1999.c | 8 ++++---- libisofs/joliet.c | 8 ++++---- libisofs/rockridge.c | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index 41ce015..40fd71d 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -343,7 +343,7 @@ void write_one_dir_record(Ecma119Image *t, Ecma119Node *node, int file_id, iso_datetime_7(rec->recording_time, t->now, t->always_gmt); } rec->flags[0] = ((node->type == ECMA119_DIR) ? 2 : 0) | (multi_extend ? 0x80 : 0); - iso_bb(rec->vol_seq_number, 1, 2); + iso_bb(rec->vol_seq_number, (uint32_t) 1, 2); rec->len_fi[0] = len_fi; /* @@ -421,9 +421,9 @@ int ecma119_writer_write_vol_desc(IsoImageWriter *writer) strncpy_pad((char*)vol.system_id, system_id, 32); strncpy_pad((char*)vol.volume_id, vol_id, 32); iso_bb(vol.vol_space_size, t->vol_space_size, 4); - iso_bb(vol.vol_set_size, 1, 2); - iso_bb(vol.vol_seq_number, 1, 2); - iso_bb(vol.block_size, BLOCK_SIZE, 2); + iso_bb(vol.vol_set_size, (uint32_t) 1, 2); + iso_bb(vol.vol_seq_number, (uint32_t) 1, 2); + iso_bb(vol.block_size, (uint32_t) BLOCK_SIZE, 2); iso_bb(vol.path_table_size, t->path_table_size, 4); iso_lsb(vol.l_path_table_pos, t->l_path_table_pos, 4); iso_msb(vol.m_path_table_pos, t->m_path_table_pos, 4); diff --git a/libisofs/iso1999.c b/libisofs/iso1999.c index e09ddf1..72a7430 100644 --- a/libisofs/iso1999.c +++ b/libisofs/iso1999.c @@ -712,7 +712,7 @@ void write_one_dir_record(Ecma119Image *t, Iso1999Node *node, int file_id, iso_bb(rec->length, len, 4); iso_datetime_7(rec->recording_time, t->now, t->always_gmt); rec->flags[0] = ((node->type == ISO1999_DIR) ? 2 : 0) | (multi_extend ? 0x80 : 0); - iso_bb(rec->vol_seq_number, 1, 2); + iso_bb(rec->vol_seq_number, (uint32_t) 1, 2); rec->len_fi[0] = len_fi; } @@ -763,9 +763,9 @@ int iso1999_writer_write_vol_desc(IsoImageWriter *writer) strncpy_pad((char*)vol.volume_id, vol_id, 32); iso_bb(vol.vol_space_size, t->vol_space_size, 4); - iso_bb(vol.vol_set_size, 1, 2); - iso_bb(vol.vol_seq_number, 1, 2); - iso_bb(vol.block_size, BLOCK_SIZE, 2); + iso_bb(vol.vol_set_size, (uint32_t) 1, 2); + iso_bb(vol.vol_seq_number, (uint32_t) 1, 2); + iso_bb(vol.block_size, (uint32_t) BLOCK_SIZE, 2); iso_bb(vol.path_table_size, t->iso1999_path_table_size, 4); iso_lsb(vol.l_path_table_pos, t->iso1999_l_path_table_pos, 4); iso_msb(vol.m_path_table_pos, t->iso1999_m_path_table_pos, 4); diff --git a/libisofs/joliet.c b/libisofs/joliet.c index 160ad47..6f32f52 100644 --- a/libisofs/joliet.c +++ b/libisofs/joliet.c @@ -758,7 +758,7 @@ void write_one_dir_record(Ecma119Image *t, JolietNode *node, int file_id, iso_bb(rec->length, len, 4); iso_datetime_7(rec->recording_time, t->now, t->always_gmt); rec->flags[0] = ((node->type == JOLIET_DIR) ? 2 : 0) | (multi_extend ? 0x80 : 0); - iso_bb(rec->vol_seq_number, 1, 2); + iso_bb(rec->vol_seq_number, (uint32_t) 1, 2); rec->len_fi[0] = len_fi; } @@ -833,9 +833,9 @@ int joliet_writer_write_vol_desc(IsoImageWriter *writer) memcpy(vol.esc_sequences, "%/E", 3); iso_bb(vol.vol_space_size, t->vol_space_size, 4); - iso_bb(vol.vol_set_size, 1, 2); - iso_bb(vol.vol_seq_number, 1, 2); - iso_bb(vol.block_size, BLOCK_SIZE, 2); + iso_bb(vol.vol_set_size, (uint32_t) 1, 2); + iso_bb(vol.vol_seq_number, (uint32_t) 1, 2); + iso_bb(vol.block_size, (uint32_t) BLOCK_SIZE, 2); iso_bb(vol.path_table_size, t->joliet_path_table_size, 4); iso_lsb(vol.l_path_table_pos, t->joliet_l_path_table_pos, 4); iso_msb(vol.m_path_table_pos, t->joliet_m_path_table_pos, 4); diff --git a/libisofs/rockridge.c b/libisofs/rockridge.c index 6d68783..51d9f9e 100644 --- a/libisofs/rockridge.c +++ b/libisofs/rockridge.c @@ -109,12 +109,12 @@ int rrip_add_PX(Ecma119Image *t, Ecma119Node *n, struct susp_info *susp) PX[2] = 36; } PX[3] = 1; - iso_bb(&PX[4], px_get_mode(t, n), 4); - iso_bb(&PX[12], n->nlink, 4); - iso_bb(&PX[20], px_get_uid(t, n), 4); - iso_bb(&PX[28], px_get_gid(t, n), 4); + iso_bb(&PX[4], (uint32_t) px_get_mode(t, n), 4); + iso_bb(&PX[12], (uint32_t) n->nlink, 4); + iso_bb(&PX[20], (uint32_t) px_get_uid(t, n), 4); + iso_bb(&PX[28], (uint32_t) px_get_gid(t, n), 4); if (t->rrip_1_10_px_ino || !t->rrip_version_1_10) { - iso_bb(&PX[36], n->ino, 4); + iso_bb(&PX[36], (uint32_t) n->ino, 4); } return susp_append(t, susp, PX); @@ -243,10 +243,10 @@ int rrip_add_PN(Ecma119Image *t, Ecma119Node *n, struct susp_info *susp) */ if (sizeof(node->dev) > 4) { high_shift = 32; - iso_bb(&PN[4], node->dev >> high_shift, 4); + iso_bb(&PN[4], (uint32_t) (node->dev >> high_shift), 4); } else iso_bb(&PN[4], 0, 4); - iso_bb(&PN[12], node->dev & 0xffffffff, 4); + iso_bb(&PN[12], (uint32_t) (node->dev & 0xffffffff), 4); return susp_append(t, susp, PN); } @@ -695,7 +695,7 @@ int susp_add_CE(Ecma119Image *t, size_t ce_len, struct susp_info *susp) CE[3] = 1; iso_bb(&CE[4], susp->ce_block, 4); iso_bb(&CE[12], susp->ce_len, 4); - iso_bb(&CE[20], ce_len, 4); + iso_bb(&CE[20], (uint32_t) ce_len, 4); return susp_append(t, susp, CE); }