From 9b6efe3914c53ef0c961798e4fe684f633b2c2a1 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 25 Oct 2009 18:29:16 +0100 Subject: [PATCH] PhotoRec: don'tinclude iso9660.h in iso.h --- src/iso.c | 3 ++- src/iso.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/iso.c b/src/iso.c index d5766c6c..7ff8c105 100644 --- a/src/iso.c +++ b/src/iso.c @@ -31,6 +31,7 @@ #endif #include "types.h" #include "common.h" +#include "iso9660.h" #include "iso.h" #include "fnctdsk.h" #include "log.h" @@ -63,7 +64,7 @@ static int set_ISO_info(const struct iso_primary_descriptor *iso, partition_t *p const unsigned int volume_space_size2=iso->volume_space_size[7] | (iso->volume_space_size[6]<<8) | (iso->volume_space_size[5]<<16) | (iso->volume_space_size[4]<<24); const unsigned int logical_block_size=iso->logical_block_size[0] | (iso->logical_block_size[1]<<8); const unsigned int logical_block_size2=iso->logical_block_size[3] | (iso->logical_block_size[2]<<8); - set_part_name_chomp(partition, iso->volume_id, 32); + set_part_name_chomp(partition, (const unsigned char*)iso->volume_id, 32); if(volume_space_size==volume_space_size2 && logical_block_size==logical_block_size2) snprintf(partition->info, sizeof(partition->info), "ISO9660"); else diff --git a/src/iso.h b/src/iso.h index 9b5cbbc9..a9033f14 100644 --- a/src/iso.h +++ b/src/iso.h @@ -22,7 +22,6 @@ #ifdef __cplusplus extern "C" { #endif -#include "iso9660.h" int check_ISO(disk_t *disk_car, partition_t *partition); int recover_ISO(disk_t *disk_car, const struct iso_primary_descriptor *iso, partition_t *partition, const int verbose, const int dump_ind);