Changeset a54af66 in mainline for uspace/lib/ext2/libext2_inode.c

Timestamp:

2011-02-23T18:21:55Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ad34feb

Parents:

f483a15

Message:

More strict inode type checking

File:

• uspace/lib/ext2/libext2_inode.c (modified) (2 diffs)

uspace/lib/ext2/libext2_inode.c

@@ -54 +54 @@
 
 /**
+ * Check whether inode is of given type
+ * 
+ * @param sb pointer to superblock structure
+ * @param inode pointer to inode
+ * @param type EXT2_INODE_MODE_TYPE_* constant to check
+ */
+inline bool ext2_inode_is_type(ext2_superblock_t *sb, ext2_inode_t *inode, uint32_t type)
+{
+        uint32_t mode = ext2_inode_get_mode(sb, inode);
+        return (mode & EXT2_INODE_MODE_TYPE_MASK) == type;
+}
+
+/**
  * Get uid this inode is belonging to
  * 
@@ -79 +92 @@
 {
         uint32_t major_rev = ext2_superblock_get_rev_major(sb);
-        uint32_t mode = ext2_inode_get_mode(sb, inode);
         
-        if (major_rev > 0 && mode & EXT2_INODE_MODE_FILE) {
+        if (major_rev > 0 && ext2_inode_is_type(sb, inode, EXT2_INODE_MODE_FILE)) {
                 return ((uint64_t)uint32_t_le2host(inode->size_high)) << 32 |
                     ((uint64_t)uint32_t_le2host(inode->size));