Move some simple functions to header

diff --git a/lwext4/ext4_dir.c b/lwext4/ext4_dir.c
index 6130ef09e150ca3e8951b52e452dc17662f2b94d..eabfa8dcfeb92921ac38559e24dc0b09caab8efc 100644 (file)
--- a/lwext4/ext4_dir.c
+++ b/lwext4/ext4_dir.c
@@ -47,71 +47,7 @@
 \r
 #include <string.h>\r
 \r
-uint32_t ext4_dir_entry_ll_get_inode(struct ext4_directory_entry_ll *de)\r
-{\r
-    return to_le32(de->inode);\r
-}\r
-\r
-void ext4_dir_entry_ll_set_inode(struct ext4_directory_entry_ll *de,\r
-    uint32_t inode)\r
-{\r
-    de->inode = to_le32(inode);\r
-}\r
-\r
-\r
-uint16_t ext4_dir_entry_ll_get_entry_length(struct ext4_directory_entry_ll *de)\r
-{\r
-    return to_le16(de->entry_length);\r
-}\r
-\r
-void ext4_dir_entry_ll_set_entry_length(struct ext4_directory_entry_ll *de,\r
-    uint16_t len)\r
-{\r
-    de->entry_length = to_le16(len);\r
-}\r
-\r
-\r
-uint16_t ext4_dir_entry_ll_get_name_length(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de)\r
-{\r
-    uint16_t v = de->name_length;\r
 \r
-    if ((ext4_get32(sb, rev_level) == 0) &&\r
-            (ext4_get32(sb, minor_rev_level) < 5))\r
-        v |= ((uint16_t)de->in.name_length_high) << 8;\r
-\r
-    return v;\r
-}\r
-void ext4_dir_entry_ll_set_name_length(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de, uint16_t len)\r
-{\r
-    de->name_length = (len << 8) >> 8;\r
-\r
-    if ((ext4_get32(sb, rev_level) == 0) &&\r
-            (ext4_get32(sb, minor_rev_level) < 5))\r
-        de->in.name_length_high = len >> 8;\r
-}\r
-\r
-\r
-\r
-uint8_t ext4_dir_entry_ll_get_inode_type(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de)\r
-{\r
-    if ((ext4_get32(sb, rev_level) > 0) ||\r
-            (ext4_get32(sb, minor_rev_level) >= 5))\r
-        return de->in.inode_type;\r
-\r
-    return EXT4_DIRECTORY_FILETYPE_UNKNOWN;\r
-}\r
-\r
-\r
-void ext4_dir_entry_ll_set_inode_type(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de, uint8_t type)\r
-{\r
-    if ((ext4_get32(sb, rev_level) > 0) ||\r
-            (ext4_get32(sb, minor_rev_level) >= 5))\r
-        de->in.inode_type = type;\r
-}\r
 \r
 /****************************************************************************/\r
 \r

diff --git a/lwext4/ext4_dir.h b/lwext4/ext4_dir.h
index ce3896300c2843a4e81068df510fd3ab8775515f..ac3fa4d75995d7818ef7a1d17527b052b2d4ab22 100644 (file)
--- a/lwext4/ext4_dir.h
+++ b/lwext4/ext4_dir.h
@@ -53,59 +53,105 @@
  * @param de Directory entry\r
  * @return I-node number\r
  */\r
-uint32_t ext4_dir_entry_ll_get_inode(struct ext4_directory_entry_ll *de);\r
+static inline uint32_t ext4_dir_entry_ll_get_inode(\r
+        struct ext4_directory_entry_ll *de)\r
+{\r
+    return to_le32(de->inode);\r
+}\r
+\r
 \r
 /**@brief Set i-node number to directory entry.\r
  * @param de Directory entry\r
  * @param inode I-node number\r
  */\r
-void ext4_dir_entry_ll_set_inode(struct ext4_directory_entry_ll *de,\r
-    uint32_t inode);\r
+static inline void ext4_dir_entry_ll_set_inode(\r
+        struct ext4_directory_entry_ll *de, uint32_t inode)\r
+{\r
+    de->inode = to_le32(inode);\r
+}\r
+\r
 \r
 /**@brief Get directory entry length.\r
  * @param de Directory entry\r
  * @return Entry length\r
  */\r
-uint16_t ext4_dir_entry_ll_get_entry_length(struct ext4_directory_entry_ll *de);\r
+static inline uint16_t ext4_dir_entry_ll_get_entry_length(\r
+        struct ext4_directory_entry_ll *de)\r
+{\r
+    return to_le16(de->entry_length);\r
+}\r
 \r
 /**@brief Set directory entry length.\r
  * @param de     Directory entry\r
  * @param length Entry length\r
  */\r
-void ext4_dir_entry_ll_set_entry_length(struct ext4_directory_entry_ll *de,\r
-    uint16_t len);\r
+static inline void ext4_dir_entry_ll_set_entry_length(\r
+        struct ext4_directory_entry_ll *de, uint16_t len)\r
+{\r
+    de->entry_length = to_le16(len);\r
+}\r
+\r
 \r
 /**@brief Get directory entry name length.\r
  * @param sb Superblock\r
  * @param de Directory entry\r
  * @return Entry name length\r
  */\r
-uint16_t ext4_dir_entry_ll_get_name_length(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de);\r
+static inline uint16_t ext4_dir_entry_ll_get_name_length(struct ext4_sblock *sb,\r
+    struct ext4_directory_entry_ll *de)\r
+{\r
+    uint16_t v = de->name_length;\r
+\r
+    if ((ext4_get32(sb, rev_level) == 0) &&\r
+            (ext4_get32(sb, minor_rev_level) < 5))\r
+        v |= ((uint16_t)de->in.name_length_high) << 8;\r
+\r
+    return v;\r
+}\r
 \r
 /**@brief Set directory entry name length.\r
  * @param sb     Superblock\r
  * @param de     Directory entry\r
  * @param length Entry name length\r
  */\r
-void ext4_dir_entry_ll_set_name_length(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de, uint16_t len);\r
+static inline void ext4_dir_entry_ll_set_name_length(struct ext4_sblock *sb,\r
+    struct ext4_directory_entry_ll *de, uint16_t len)\r
+{\r
+    de->name_length = (len << 8) >> 8;\r
+\r
+    if ((ext4_get32(sb, rev_level) == 0) &&\r
+            (ext4_get32(sb, minor_rev_level) < 5))\r
+        de->in.name_length_high = len >> 8;\r
+}\r
+\r
 \r
 /**@brief Get i-node type of directory entry.\r
  * @param sb Superblock\r
  * @param de Directory entry\r
  * @return I-node type (file, dir, etc.)\r
  */\r
-uint8_t ext4_dir_entry_ll_get_inode_type(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de);\r
+static inline uint8_t ext4_dir_entry_ll_get_inode_type(struct ext4_sblock *sb,\r
+    struct ext4_directory_entry_ll *de)\r
+{\r
+    if ((ext4_get32(sb, rev_level) > 0) ||\r
+            (ext4_get32(sb, minor_rev_level) >= 5))\r
+        return de->in.inode_type;\r
 \r
+    return EXT4_DIRECTORY_FILETYPE_UNKNOWN;\r
+}\r
 /**@brief Set i-node type of directory entry.\r
  * @param sb   Superblock\r
  * @param de   Directory entry\r
  * @param type I-node type (file, dir, etc.)\r
  */\r
-void ext4_dir_entry_ll_set_inode_type(struct ext4_sblock *sb,\r
-    struct ext4_directory_entry_ll *de, uint8_t type);\r
+\r
+static inline void ext4_dir_entry_ll_set_inode_type(struct ext4_sblock *sb,\r
+    struct ext4_directory_entry_ll *de, uint8_t type)\r
+{\r
+    if ((ext4_get32(sb, rev_level) > 0) ||\r
+            (ext4_get32(sb, minor_rev_level) >= 5))\r
+        de->in.inode_type = type;\r
+}\r
 \r
 /**@brief Initialize directory iterator.\r
  * Set position to the first valid entry from the required position.\r