X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=lwext4%2Fext4_dir.h;h=37547eaf8c91f3f99fe06d752cfdf2275b9aadb9;hb=8f81cab8ae1a5d77fefb69698e92fa0a1dd1cdb4;hp=bb1ffe0e428abb7d5686420b732b6d3f6e2d95f3;hpb=2dcb04101f350c40b7ea7ea160933d0be5d86826;p=lwext4.git

diff --git a/lwext4/ext4_dir.h b/lwext4/ext4_dir.h
index bb1ffe0..37547ea 100644
--- a/lwext4/ext4_dir.h
+++ b/lwext4/ext4_dir.h
@@ -42,6 +42,10 @@
 #ifndef EXT4_DIR_H_
 #define EXT4_DIR_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "ext4_config.h"
 #include "ext4_types.h"
 #include "ext4_blockdev.h"
@@ -54,7 +58,7 @@
  * @return I-node number
  */
 static inline uint32_t
-ext4_dir_entry_ll_get_inode(struct ext4_dir_entry_ll *de)
+ext4_dir_en_get_inode(struct ext4_dir_en *de)
 {
 	return to_le32(de->inode);
 }
@@ -64,7 +68,7 @@ ext4_dir_entry_ll_get_inode(struct ext4_dir_entry_ll *de)
  * @param inode I-node number
  */
 static inline void
-ext4_dir_entry_ll_set_inode(struct ext4_dir_entry_ll *de, uint32_t inode)
+ext4_dir_en_set_inode(struct ext4_dir_en *de, uint32_t inode)
 {
 	de->inode = to_le32(inode);
 }
@@ -74,7 +78,7 @@ ext4_dir_entry_ll_set_inode(struct ext4_dir_entry_ll *de, uint32_t inode)
  * @param inode I-node number
  */
 static inline void
-ext4_dx_dot_entry_set_inode(struct ext4_dir_idx_dot_entry *de, uint32_t inode)
+ext4_dx_dot_en_set_inode(struct ext4_dir_idx_dot_en *de, uint32_t inode)
 {
 	de->inode = to_le32(inode);
 }
@@ -83,21 +87,18 @@ ext4_dx_dot_entry_set_inode(struct ext4_dir_idx_dot_entry *de, uint32_t inode)
  * @param de Directory entry
  * @return Entry length
  */
-static inline uint16_t
-ext4_dir_entry_ll_get_entry_length(struct ext4_dir_entry_ll *de)
+static inline uint16_t ext4_dir_en_get_entry_len(struct ext4_dir_en *de)
 {
-	return to_le16(de->entry_length);
+	return to_le16(de->entry_len);
 }
 
 /**@brief Set directory entry length.
  * @param de     Directory entry
  * @param length Entry length
  */
-static inline void
-ext4_dir_entry_ll_set_entry_length(struct ext4_dir_entry_ll *de,
-				   uint16_t len)
+static inline void ext4_dir_en_set_entry_len(struct ext4_dir_en *de, uint16_t l)
 {
-	de->entry_length = to_le16(len);
+	de->entry_len = to_le16(l);
 }
 
 /**@brief Get directory entry name length.
@@ -105,11 +106,10 @@ ext4_dir_entry_ll_set_entry_length(struct ext4_dir_entry_ll *de,
  * @param de Directory entry
  * @return Entry name length
  */
-static inline uint16_t
-ext4_dir_entry_ll_get_name_length(struct ext4_sblock *sb,
-				  struct ext4_dir_entry_ll *de)
+static inline uint16_t ext4_dir_en_get_name_len(struct ext4_sblock *sb,
+						struct ext4_dir_en *de)
 {
-	uint16_t v = de->name_length;
+	uint16_t v = de->name_len;
 
 	if ((ext4_get32(sb, rev_level) == 0) &&
 	    (ext4_get32(sb, minor_rev_level) < 5))
@@ -123,10 +123,11 @@ ext4_dir_entry_ll_get_name_length(struct ext4_sblock *sb,
  * @param de     Directory entry
  * @param length Entry name length
  */
-static inline void ext4_dir_entry_ll_set_name_length(
-    struct ext4_sblock *sb, struct ext4_dir_entry_ll *de, uint16_t len)
+static inline void ext4_dir_en_set_name_len(struct ext4_sblock *sb,
+					    struct ext4_dir_en *de,
+					    uint16_t len)
 {
-	de->name_length = (len << 8) >> 8;
+	de->name_len = (len << 8) >> 8;
 
 	if ((ext4_get32(sb, rev_level) == 0) &&
 	    (ext4_get32(sb, minor_rev_level) < 5))
@@ -138,15 +139,14 @@ static inline void ext4_dir_entry_ll_set_name_length(
  * @param de Directory entry
  * @return I-node type (file, dir, etc.)
  */
-static inline uint8_t
-ext4_dir_entry_ll_get_inode_type(struct ext4_sblock *sb,
-				 struct ext4_dir_entry_ll *de)
+static inline uint8_t ext4_dir_en_get_inode_type(struct ext4_sblock *sb,
+						 struct ext4_dir_en *de)
 {
 	if ((ext4_get32(sb, rev_level) > 0) ||
 	    (ext4_get32(sb, minor_rev_level) >= 5))
 		return de->in.inode_type;
 
-	return EXT4_DIRENTRY_UNKNOWN;
+	return EXT4_DE_UNKNOWN;
 }
 /**@brief Set i-node type of directory entry.
  * @param sb   Superblock
@@ -154,12 +154,12 @@ ext4_dir_entry_ll_get_inode_type(struct ext4_sblock *sb,
  * @param type I-node type (file, dir, etc.)
  */
 
-static inline void ext4_dir_entry_ll_set_inode_type(
-    struct ext4_sblock *sb, struct ext4_dir_entry_ll *de, uint8_t type)
+static inline void ext4_dir_en_set_inode_type(struct ext4_sblock *sb,
+					      struct ext4_dir_en *de, uint8_t t)
 {
 	if ((ext4_get32(sb, rev_level) > 0) ||
 	    (ext4_get32(sb, minor_rev_level) >= 5))
-		de->in.inode_type = type;
+		de->in.inode_type = t;
 }
 
 /**@brief Verify checksum of a linear directory leaf block
@@ -167,9 +167,8 @@ static inline void ext4_dir_entry_ll_set_inode_type(
  * @param dirent    Linear directory leaf block
  * @return true means the block passed checksum verification
  */
-bool
-ext4_dir_checksum_verify(struct ext4_inode_ref *inode_ref,
-			 struct ext4_dir_entry_ll *dirent);
+bool ext4_dir_csum_verify(struct ext4_inode_ref *inode_ref,
+			  struct ext4_dir_en *dirent);
 
 /**@brief Initialize directory iterator.
  * Set position to the first valid entry from the required position.
@@ -178,32 +177,31 @@ ext4_dir_checksum_verify(struct ext4_inode_ref *inode_ref,
  * @param pos       Position to start reading entries from
  * @return Error code
  */
-int ext4_dir_iterator_init(struct ext4_dir_iterator *it,
+int ext4_dir_iterator_init(struct ext4_dir_iter *it,
 			   struct ext4_inode_ref *inode_ref, uint64_t pos);
 
 /**@brief Jump to the next valid entry
  * @param it Initialized iterator
  * @return Error code
  */
-int ext4_dir_iterator_next(struct ext4_dir_iterator *it);
+int ext4_dir_iterator_next(struct ext4_dir_iter *it);
 
 /**@brief Uninitialize directory iterator.
  *        Release all allocated structures.
  * @param it Iterator to be finished
  * @return Error code
  */
-int ext4_dir_iterator_fini(struct ext4_dir_iterator *it);
+int ext4_dir_iterator_fini(struct ext4_dir_iter *it);
 
 /**@brief Write directory entry to concrete data block.
  * @param sb        Superblock
- * @param entry     Pointer to entry to be written
+ * @param en     Pointer to entry to be written
  * @param entry_len Length of new entry
  * @param child     Child i-node to be written to new entry
  * @param name      Name of the new entry
  * @param name_len  Length of entry name
  */
-void ext4_dir_write_entry(struct ext4_sblock *sb,
-			  struct ext4_dir_entry_ll *entry,
+void ext4_dir_write_entry(struct ext4_sblock *sb, struct ext4_dir_en *en,
 			  uint16_t entry_len, struct ext4_inode_ref *child,
 			  const char *name, size_t name_len);
 
@@ -238,8 +236,8 @@ int ext4_dir_remove_entry(struct ext4_inode_ref *parent, const char *name,
 
 /**@brief Try to insert entry to concrete data block.
  * @param sb           Superblock
- * @param inode_ref     Directory i-node
- * @param target_block Block to try to insert entry to
+ * @param inode_ref    Directory i-node
+ * @param dst_blk      Block to try to insert entry to
  * @param child        Child i-node to be inserted by new entry
  * @param name         Name of the new entry
  * @param name_len     Length of the new entry name
@@ -247,7 +245,7 @@ int ext4_dir_remove_entry(struct ext4_inode_ref *parent, const char *name,
  */
 int ext4_dir_try_insert_entry(struct ext4_sblock *sb,
 			      struct ext4_inode_ref *inode_ref,
-			      struct ext4_block *target_block,
+			      struct ext4_block *dst_blk,
 			      struct ext4_inode_ref *child, const char *name,
 			      uint32_t name_len);
 
@@ -261,7 +259,7 @@ int ext4_dir_try_insert_entry(struct ext4_sblock *sb,
  */
 int ext4_dir_find_in_block(struct ext4_block *block, struct ext4_sblock *sb,
 			   size_t name_len, const char *name,
-			   struct ext4_dir_entry_ll **res_entry);
+			   struct ext4_dir_en **res_entry);
 
 /**@brief Simple function to release allocated data from result.
  * @param parent Parent inode
@@ -272,11 +270,15 @@ int ext4_dir_find_in_block(struct ext4_block *block, struct ext4_sblock *sb,
 int ext4_dir_destroy_result(struct ext4_inode_ref *parent,
 			    struct ext4_dir_search_result *result);
 
-void ext4_dir_set_checksum(struct ext4_inode_ref *inode_ref,
-			   struct ext4_dir_entry_ll *dirent);
+void ext4_dir_set_csum(struct ext4_inode_ref *inode_ref,
+		       struct ext4_dir_en *dirent);
+
 
-/* checksumming functions */
-void initialize_dir_tail(struct ext4_dir_entry_tail *t);
+void ext4_dir_init_entry_tail(struct ext4_dir_entry_tail *t);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* EXT4_DIR_H_ */