Browse Source

Removed some defunct code from xorrisoburn.c

tags/ZeroThreeZero
Thomas Schmitt 12 years ago
parent
commit
84135f523a
2 changed files with 1 additions and 27 deletions
  1. +1
    -1
      xorriso/xorriso_timestamp.h
  2. +0
    -26
      xorriso/xorrisoburn.c

+ 1
- 1
xorriso/xorriso_timestamp.h View File

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

+ 0
- 26
xorriso/xorrisoburn.c View File

@@ -944,13 +944,6 @@ int Xorriso_set_isolinux_options(struct XorrisO *xorriso,
ElToritoBootImage *bootimg;
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);
if(ret != 1) {
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) {
make_isohybrid_mbr= 1;
} 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);
if(ret < 0)
return(0);
if(ret > 0)
make_isohybrid_mbr= 1;

#endif

}

if(xorriso->boot_image_isohybrid == 2 && !make_isohybrid_mbr) {


Loading…
Cancel
Save