From 042dbd01ed796aa52c6731b6d2801bc8d649f976 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 20 Jul 2012 12:21:36 +0200 Subject: [PATCH] Removed obsolete development marks --- doc/boot_sectors.txt | 2 +- libisofs/eltorito.h | 10 +++++----- libisofs/hfsplus.c | 4 ++-- libisofs/libisofs.h | 7 ++++--- libisofs/system_area.c | 2 +- libisofs/tree.c | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/boot_sectors.txt b/doc/boot_sectors.txt index 3b6374f..416097f 100644 --- a/doc/boot_sectors.txt +++ b/doc/boot_sectors.txt @@ -33,7 +33,7 @@ Common Hardware Reference Platform (CHRP), for IBM PowerPC Combinations of boot mechanisms: - SYSLINUX isohybrid MBR -- SYSLINUX isohybrid for MBR, UEFI and x86 Mac +- SYSLINUX isohybrid for MBR, UEFI and x86-Mac - GRUB2 grub-mkrescue MBR >>> Mac and/or PowerPC bootable GRUB2 image with HFS+/FAT, APM, EFI GPT partition, PreP MBR partition, mountable FAT partition diff --git a/libisofs/eltorito.h b/libisofs/eltorito.h index 09514e8..506c3b6 100644 --- a/libisofs/eltorito.h +++ b/libisofs/eltorito.h @@ -64,11 +64,11 @@ struct el_torito_boot_image { * bit 1 -> whether to put built-in isolinux 3.72 isohybrid-MBR into image * System Area (deprecated) * - * >>> bit2-7= Mentioning in isohybrid GPT - * >>> 0= do not mention in GPT - * >>> 1= mention as EFI partition - * >>> 2= Mention as HFS+ partition - * >>> bit8= Mention in isohybrid Apple partition map + * bit2-7= Mentioning in isohybrid GPT + * 0= do not mention in GPT + * 1= mention as EFI partition + * 2= Mention as HFS+ partition + * bit8= Mention in isohybrid Apple partition map */ unsigned int isolinux_options; unsigned char type; /**< The type of image */ diff --git a/libisofs/hfsplus.c b/libisofs/hfsplus.c index 9e63241..a02e792 100644 --- a/libisofs/hfsplus.c +++ b/libisofs/hfsplus.c @@ -1468,8 +1468,8 @@ int try_mangle(Ecma119Image *target, uint32_t idx, uint32_t prev_idx, goto no_success; } - /* >>> "-" sorts lower than capital letters , - "_" causes longer rotations + /* "-" would sort lower than capital letters , + traditional "_" causes longer rotations */ sprintf(new_name, "%s_%s", prefix, number); diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 97593b5..eba25d5 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -1433,6 +1433,9 @@ int iso_write_opts_set_joliet(IsoWriteOpts *opts, int enable); int iso_write_opts_set_hfsplus(IsoWriteOpts *opts, int enable); /** + * >>> Production of FAT32 is not implemented yet. + * >>> This call exists only as preparation for implementation. + * * Whether to add a FAT32 filesystem to the image which points to the same * file content as the other directory trees. * @@ -2369,7 +2372,7 @@ int iso_write_opts_set_tail_blocks(IsoWriteOpts *opts, uint32_t num_blocks); * containing only raw ELF and having type 0x41." * * This feature is only combinable with system area type 0 - * >>> and currently not combinable with ISOLINUX isohybrid production. + * and currently not combinable with ISOLINUX isohybrid production. * It overrides --protective-msdos-label. See iso_write_opts_set_system_area(). * Only partition 4 stays available for iso_write_opts_set_partition_img(). * It is compatible with HFS+/FAT production by storing the PreP partition @@ -3476,8 +3479,6 @@ int el_torito_seems_boot_info_table(ElToritoBootImage *bootimg, int flag); * 1= Mention as Basic Data partition. * This cannot be combined with GPT partitions as of * iso_write_opts_set_efi_bootp() - * >>> ts B20620 : and not with iso_write_opts_set_hfsplus() - * >>> if it produces GPT entries * @since 1.2.4 * 2= Mention as HFS+ partition. * This cannot be combined with HFS+ production by diff --git a/libisofs/system_area.c b/libisofs/system_area.c index c7c6712..7110ae0 100644 --- a/libisofs/system_area.c +++ b/libisofs/system_area.c @@ -1969,7 +1969,7 @@ static int precompute_gpt(Ecma119Image *t) /* ret = iso_quick_gpt_entry(t, 16, 20, hfs_uuid, zero_uuid, gpt_flags, gpt_name); - / * >>> Caution: Size 90 causes intentional partition overlap error * / + / * Caution: Size 90 causes intentional partition overlap error * / ret = iso_quick_gpt_entry(t, 30, 90, hfs_uuid, zero_uuid, gpt_flags, gpt_name); */ diff --git a/libisofs/tree.c b/libisofs/tree.c index 8258532..af58794 100644 --- a/libisofs/tree.c +++ b/libisofs/tree.c @@ -1211,9 +1211,9 @@ int iso_tree_resolve_symlink(IsoImage *img, IsoSymlink *sym, IsoNode **res, if (dest[0] == '/') { - /* >>> ??? How to resolve absolute links without knowing the - path of the future mount point ? - ??? Would it be better to throw error ? + /* ??? How to resolve absolute links without knowing the + path of the future mount point ? + ??? Would it be better to throw error ? I can only assume that it gets mounted at / during some stage of booting. */;