From cc672d525b6a12d2adbcbb4668f7c7f3f77f058c Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 11 Sep 2010 12:50:36 +0000 Subject: [PATCH] Removed development marks --- libisoburn/isoburn.c | 5 ++--- libisoburn/isoburn.h | 22 +++++++++------------- libisoburn/isofs_wrap.c | 6 ++---- libisoburn/libisoburn.h | 29 ++++++++++++----------------- xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 26 insertions(+), 38 deletions(-) diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c index 2907cc91..5bc40549 100644 --- a/libisoburn/isoburn.c +++ b/libisoburn/isoburn.c @@ -355,9 +355,8 @@ int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[], } -/* TWINTREE: - Check whether size of target_iso_head matches partition offset. - Eventually adjust size. +/** Check whether the size of target_iso_head matches the given partition + offset. Eventually adjust size. */ int isoburn_adjust_target_iso_head(struct isoburn *o, uint32_t offst, int flag) diff --git a/libisoburn/isoburn.h b/libisoburn/isoburn.h index 2ca76e07..d301c023 100644 --- a/libisoburn/isoburn.h +++ b/libisoburn/isoburn.h @@ -38,7 +38,6 @@ int isoburn_toc_entry_destroy(struct isoburn_toc_entry **o, int flag); /* Minimal size of target_iso_head which is to be written during isoburn_activate_session(). - TWINTREE: Within this size there is everything that is needed for image access with no partition offset. The actual target_iso_head buffer must be larger by the evential partition offset. @@ -253,9 +252,8 @@ isoburn_data_source_new(struct burn_drive *d); int isoburn_data_source_shutdown(IsoDataSource *src, int flag); -/** TWINTREE: - Check whether size of target_iso_head matches offset. - Eventually adjust size. +/** Check whether the size of target_iso_head matches the given partition + offset. Eventually adjust size. */ int isoburn_adjust_target_iso_head(struct isoburn *o, uint32_t offst, int flag); @@ -537,15 +535,14 @@ struct isoburn_imgen_opts { and timezone 0 */ char vol_uuid[17]; - /* TWINTREE: The number of unclaimed 2K blocks before - start of partition 1 as of the MBR in system area. - If not 0 this will cause double volume descriptor sets - and double tree. + /* The number of unclaimed 2K blocks before start of partition 1 as of + the MBR in system area. If not 0 this will cause double volume + descriptor sets and double tree. */ uint32_t partition_offset; - /* TWINTREE: Partition table parameter: 1 to 63, 0= disabled/default */ + /* Partition table parameter: 1 to 63, 0= disabled/default */ int partition_secs_per_head; - /* TWINTREE: 1 to 255, 0= disabled/default */ + /* 1 to 255, 0= disabled/default */ int partition_heads_per_cyl; }; @@ -584,9 +581,8 @@ struct isoburn_imgen_opts { In this case, no copy of the session 1 header is maintained and no TOC will be possible. Thus writing begins sequentially at LBA 0. - TWINTREE: - This macro gives the minimal size of an image header. It has to be - enlarged by the eventual partition offset. + IMPORTANT: This macro gives the minimal size of an image header. + It has to be enlarged by the eventual partition offset. */ #define Libisoburn_overwriteable_starT \ ((off_t) (Libisoburn_target_head_sizE/2048)) diff --git a/libisoburn/isofs_wrap.c b/libisoburn/isofs_wrap.c index fd9a990f..7e6164c1 100644 --- a/libisoburn/isofs_wrap.c +++ b/libisoburn/isofs_wrap.c @@ -305,8 +305,7 @@ int isoburn_activate_session(struct burn_drive *drive) } -/** TWINTREE: - API @since 0.6.2 +/** API @since 0.6.2 */ int isoburn_get_img_partition_offset(struct burn_drive *drive, uint32_t *block_offset_2k) @@ -327,8 +326,7 @@ int isoburn_get_img_partition_offset(struct burn_drive *drive, } -/* TWINTREE: - Check for MBR signature and a first partition that starts at a 2k block +/* Check for MBR signature and a first partition that starts at a 2k block and ends where the image ends. If not too large or too small, accept its start as partition offset. */ diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h index 7ab8aab2..27e73d6a 100644 --- a/libisoburn/libisoburn.h +++ b/libisoburn/libisoburn.h @@ -1222,21 +1222,17 @@ int isoburn_igopt_set_system_area(struct isoburn_imgen_opts *o, int isoburn_igopt_get_system_area(struct isoburn_imgen_opts *o, char data[32768], int *options); -/** >>> TWINTREE : Under Construction. - Do not use yet for multi-session - - Control production of a second set of volume descriptors (ISO 9660 superblock) - and directory trees, together with a partition table entry in the MBR which - has non-zero start address. - The second volume descriptor set and trees will allow to mount the ISO image - at the start of the first partition, while it is still possible to mount it - via the normal fist volume descriptor set and tree at the start of the device. - This makes few sense on optical media. Nevertheless it creates a conventional - partition table on USB sticks which then are mountable on Linux via /dev/sdb - and /dev/sdb1 alike. - - >>> Not combinable with multi-session yet. - +/** Control production of a second set of volume descriptors (superblock) + and directory trees, together with a partition table in the MBR where the + first partition has non-zero start address and the others are zeroed. + The first partition stretches to the end of the whole ISO image. + The additional volume descriptor set and trees will allow to mount the + ISO image at the start of the first partition, while it is still possible + to mount it via the normal first volume descriptor set and tree at the + start of the image resp. storage device. + This makes few sense on optical media. But on USB sticks it creates a + conventional partition table which makes it mountable on e.g. Linux via + /dev/sdb and /dev/sdb1 alike. @since 0.6.2 @param opts The option set to be manipulated. @@ -1361,8 +1357,7 @@ int isoburn_set_read_pacifier(struct burn_drive *drive, int (*read_pacifier)(IsoImage*, IsoFileSource*), void *app_handle); -/** TWINTREE: - Inquire the partition offset of the loaded image. The first 512 bytes of +/** Inquire the partition offset of the loaded image. The first 512 bytes of the image get examined whether they bear an MBR signature and a first partition table entry which matches the size of the image. In this case the start address is recorded as partition offset and internal buffers diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 8211f7f8..729856e3 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.09.10.171223" +#define Xorriso_timestamP "2010.09.11.125002"