luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PhotoRec: don'tinclude iso9660.h in iso.h

Browse source
This commit is contained in:
Christophe Grenier 2009-10-25 18:29:16 +01:00
parent 67e2a113f9
commit 9b6efe3914
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/iso.c
View file

@ -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

1
src/iso.h
View file

@ -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);