From e6588526838caece95296b3169ece4f4429816f4 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 19 Jan 2020 17:56:41 +0100 Subject: Update explanation on directory index accounting Tests with the Debian image (which is generated with squashfs-tools, so should be interpreted as ground truth) have showed that the count is not stored off-by-one. The code was already doing the right thing, but the documentation was wrong. Signed-off-by: David Oberhollenzer --- doc/format.txt | 4 ++-- include/sqfs/inode.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/format.txt b/doc/format.txt index 1e059c2..b1d2df5 100644 --- a/doc/format.txt +++ b/doc/format.txt @@ -662,8 +662,8 @@ +------+--------------+------------------------------------------------------+ | u32 | parent inode | Same as above. | +------+--------------+------------------------------------------------------+ - | u16 | index count | One less than the number of directory index entries | - | | | following the inode structure. | + | u16 | index count | The number of directory index entries following the | + | | | inode structure. | +------+--------------+------------------------------------------------------+ | u16 | block offset | Same as above. | +------+--------------+------------------------------------------------------+ diff --git a/include/sqfs/inode.h b/include/sqfs/inode.h index f2b6ede..65ff45e 100644 --- a/include/sqfs/inode.h +++ b/include/sqfs/inode.h @@ -447,8 +447,8 @@ struct sqfs_inode_dir_ext_t { /** * @brief Number of directory index entries following the inode * - * This number is stored off-by one and counts the number of - * @ref sqfs_dir_index_t entries following the inode. + * This number counts the number of @ref sqfs_dir_index_t entries + * following the inode. */ sqfs_u16 inodex_count; -- cgit v1.2.3