From 55f65a021f36acd8922413c2b114393749dfc2da Mon Sep 17 00:00:00 2001 From: Brian Carrier <carrier@sleuthkit.org> Date: Wed, 1 Apr 2020 06:56:35 -0400 Subject: [PATCH] Added comments and unique short names --- tsk/fs/fs_types.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tsk/fs/fs_types.c b/tsk/fs/fs_types.c index f8ce71b5c..eef6b4fae 100644 --- a/tsk/fs/fs_types.c +++ b/tsk/fs/fs_types.c @@ -39,18 +39,18 @@ typedef struct { * name so that we can map between values and names. */ static FS_TYPES fs_type_table[] = { - {"ntfs", TSK_FS_TYPE_NTFS, "NTFS"}, + {"ntfs", TSK_FS_TYPE_NTFS, "NTFS"}, // NTFS == NTFS_DETECT {"fat", TSK_FS_TYPE_FAT_DETECT, "FAT (Auto Detection)"}, {"ext", TSK_FS_TYPE_EXT_DETECT, "ExtX (Auto Detection)"}, - {"iso9660", TSK_FS_TYPE_ISO9660, "ISO9660 CD"}, + {"iso9660", TSK_FS_TYPE_ISO9660, "ISO9660 CD"}, // ISO9660 == DETECT #if TSK_USE_HFS - {"hfs", TSK_FS_TYPE_HFS, "HFS+"}, - {"hfs", TSK_FS_TYPE_HFS_DETECT, "HFS+"}, - {"hfs", TSK_FS_TYPE_HFS_LEGACY, "HFS"}, + {"hfs", TSK_FS_TYPE_HFS_DETECT, "HFS+ (Auto Detection)"}, #endif + {"yaffs2", TSK_FS_TYPE_YAFFS2, "YAFFS2"}, + {"apfs", TSK_FS_TYPE_APFS, "APFS"}, {"ufs", TSK_FS_TYPE_FFS_DETECT, "UFS (Auto Detection)"}, - {"raw", TSK_FS_TYPE_RAW, "Raw Data"}, - {"swap", TSK_FS_TYPE_SWAP, "Swap Space"}, + {"raw", TSK_FS_TYPE_RAW, "Raw Data"}, // RAW == RAW_DETECT + {"swap", TSK_FS_TYPE_SWAP, "Swap Space"}, // SWAP == SWAP_DETECT {"fat12", TSK_FS_TYPE_FAT12, "FAT12"}, {"fat16", TSK_FS_TYPE_FAT16, "FAT16"}, {"fat32", TSK_FS_TYPE_FAT32, "FAT32"}, @@ -60,8 +60,10 @@ static FS_TYPES fs_type_table[] = { {"ext4", TSK_FS_TYPE_EXT4, "Ext4"}, {"ufs1", TSK_FS_TYPE_FFS1, "UFS1"}, {"ufs2", TSK_FS_TYPE_FFS2, "UFS2"}, - {"yaffs2", TSK_FS_TYPE_YAFFS2, "YAFFS2"}, - {"apfs", TSK_FS_TYPE_APFS, "APFS"}, +#if TSK_USE_HFS + {"hfsp", TSK_FS_TYPE_HFS, "HFS+"}, + {"hfsl", TSK_FS_TYPE_HFS_LEGACY, "HFS (Legacy)"}, +#endif {0,0,""}, }; -- GitLab