From bce5a0251ca8f082b6f04fae864a66f1ab51a1db Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 25 Jul 2012 18:15:26 +0000
Subject: [PATCH] Clarified role of drive when parsing already loaded ISO 9660
 superblock

---
 libisoburn/trunk/libisoburn/burn_wrap.c      | 6 +++---
 libisoburn/trunk/libisoburn/libisoburn.h     | 5 +++--
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libisoburn/trunk/libisoburn/burn_wrap.c b/libisoburn/trunk/libisoburn/burn_wrap.c
index f675b540..fbe4815c 100644
--- a/libisoburn/trunk/libisoburn/burn_wrap.c
+++ b/libisoburn/trunk/libisoburn/burn_wrap.c
@@ -1199,7 +1199,7 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
                bit15= -reserved-
    @return 1 seems to be a valid ISO image , 0 format not recognized, <0 error
 */
-int isoburn_read_iso_head_parse(struct burn_drive *d, unsigned char *data,
+int isoburn_read_iso_head_parse(unsigned char *data,
                                 int *image_blocks, char *info, int flag)
 {
  int i, info_mode;
@@ -1297,13 +1297,13 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
  }
 
  if(flag&(1<<14)) {
-   ret= isoburn_read_iso_head_parse(d, buffer, image_blocks, info, info_mode);
+   ret= isoburn_read_iso_head_parse(buffer, image_blocks, info, info_mode);
    if(ret<0)
      goto ex;
    if(ret>0)
      {ret= 2; goto ex;}
  }
- ret= isoburn_read_iso_head_parse(d, buffer+32*1024, image_blocks, info,
+ ret= isoburn_read_iso_head_parse(buffer+32*1024, image_blocks, info,
                                   info_mode);
  if(ret<=0)
    goto ex;
diff --git a/libisoburn/trunk/libisoburn/libisoburn.h b/libisoburn/trunk/libisoburn/libisoburn.h
index 6adde64d..dea2aafa 100644
--- a/libisoburn/trunk/libisoburn/libisoburn.h
+++ b/libisoburn/trunk/libisoburn/libisoburn.h
@@ -688,8 +688,9 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
                  2= @since 0.2.2 :
                     copy 64 kB header to info (needs 65536 bytes) 
                 bit13= @since 0.2.2:
-                      do not read head from medium but use first 64 kB from
-                      info
+                       Do not read head from medium but use first 64 kB from
+                       info.
+                       In this case it is permissible to submit d == NULL.
                 bit14= check both half buffers (not only second)
                        return 2 if found in first block
                 bit15= return -1 on read error
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 7dd884fc..d0257c69 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.07.20.184237"
+#define Xorriso_timestamP "2012.07.25.181415"