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

Removed some defunct code from xorrisoburn.c

Browse Source
This commit is contained in:
Thomas Schmitt 2008-11-07 20:19:42 +00:00
parent 581ea8f33b
commit 29817bc019
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.11.07.173315" #define Xorriso_timestamP "2008.11.07.201909"

26
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -944,13 +944,6 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
ElToritoBootImage *bootimg; ElToritoBootImage *bootimg;
IsoFile *bootimg_node; IsoFile *bootimg_node;
#ifdef NIX
unsigned char buf[68];
void *data_stream= NULL;
#endif /* NIX */
ret= iso_image_get_boot_image(image, &bootimg, &bootimg_node, NULL); ret= iso_image_get_boot_image(image, &bootimg, &bootimg_node, NULL);
if(ret != 1) { if(ret != 1) {
sprintf(xorriso->info_text, "Programming error: No boot image available in Xorriso_set_isolinux_options()"); sprintf(xorriso->info_text, "Programming error: No boot image available in Xorriso_set_isolinux_options()");
@ -965,30 +958,11 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
if(xorriso->boot_image_isohybrid == 3) { if(xorriso->boot_image_isohybrid == 3) {
make_isohybrid_mbr= 1; make_isohybrid_mbr= 1;
} else { } else {
#ifdef NIX
ret= Xorriso_iso_file_open(xorriso, "", (void *) bootimg_node,
&data_stream, 1);
if(ret<=0)
return(ret);
ret= Xorriso_iso_file_read(xorriso, data_stream, (char *) buf, 68, 0);
Xorriso_iso_file_close(xorriso, &data_stream, 0);
if(ret<=0)
return(ret);
if(buf[64] == 0xfb && buf[65] == 0xc0 && buf[66] == 0x78 && buf[67] == 0x70)
make_isohybrid_mbr= 1;
#else
ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0); ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0);
if(ret < 0) if(ret < 0)
return(0); return(0);
if(ret > 0) if(ret > 0)
make_isohybrid_mbr= 1; make_isohybrid_mbr= 1;
#endif
} }
if(xorriso->boot_image_isohybrid == 2 && !make_isohybrid_mbr) { if(xorriso->boot_image_isohybrid == 2 && !make_isohybrid_mbr) {