Fix compile warnings for 16 bit machines

[lwext4.git] / lwext4 / ext4_fs.h

diff --git a/lwext4/ext4_fs.h b/lwext4/ext4_fs.h
index 34ee183a563a75ac3b5495093450a70913f5a09a..b475af7d02be1b63c3e306604d98b1c015af99bf 100644 (file)
--- a/lwext4/ext4_fs.h
+++ b/lwext4/ext4_fs.h
@@ -54,13 +54,12 @@
  * @return Relative number of block
  */
 static inline uint32_t ext4_fs_baddr2_index_in_group(struct ext4_sblock *s,
-                                                     uint32_t baddr)
+                                                    uint32_t baddr)
 {
-    ext4_assert(baddr);
-    if (ext4_get32(s, first_data_block))
-        baddr--;
+       if (ext4_get32(s, first_data_block))
+               baddr--;
 
-    return baddr % ext4_get32(s, blocks_per_group);
+       return baddr % ext4_get32(s, blocks_per_group);
 }
 
 /**@brief Convert relative block address in group to absolute address.
@@ -70,21 +69,21 @@ static inline uint32_t ext4_fs_baddr2_index_in_group(struct ext4_sblock *s,
  * @return Absolute block address
  */
 static inline uint32_t ext4_fs_index_in_group2_baddr(struct ext4_sblock *s,
-                                                     uint32_t index,
-                                                     uint32_t bgid)
+                                                    uint32_t index,
+                                                    uint32_t bgid)
 {
-    if (ext4_get32(s, first_data_block))
-        index++;
+       if (ext4_get32(s, first_data_block))
+               index++;
 
-    return ext4_get32(s, blocks_per_group) * bgid + index;
+       return ext4_get32(s, blocks_per_group) * bgid + index;
 }
 
 /**@brief TODO: */
 static inline uint64_t ext4_fs_first_bg_block_no(struct ext4_sblock *s,
-                                                 uint32_t bgid)
+                                                uint32_t bgid)
 {
-    return (uint64_t)bgid * ext4_get32(s, blocks_per_group) +
-           ext4_get32(s, first_data_block);
+       return (uint64_t)bgid * ext4_get32(s, blocks_per_group) +
+              ext4_get32(s, first_data_block);
 }
 
 /**@brief Initialize filesystem and read all needed data.
@@ -117,7 +116,7 @@ int ext4_fs_check_features(struct ext4_fs *fs, bool *read_only);
  * @return Error code
  */
 int ext4_fs_get_block_group_ref(struct ext4_fs *fs, uint32_t bgid,
-                                struct ext4_block_group_ref *ref);
+                               struct ext4_block_group_ref *ref);
 
 /**@brief Put reference to block group.
  * @param ref Pointer for reference to be put back
@@ -132,7 +131,13 @@ int ext4_fs_put_block_group_ref(struct ext4_block_group_ref *ref);
  * @return Error code
  */
 int ext4_fs_get_inode_ref(struct ext4_fs *fs, uint32_t index,
-                          struct ext4_inode_ref *ref);
+                         struct ext4_inode_ref *ref);
+
+/**@brief Reset blocks field of i-node.
+ * @param fs        Filesystem to reset blocks field of i-inode on
+ * @param inode_ref ref Pointer for inode to be operated on
+ */
+void ext4_fs_inode_blocks_init(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref);
 
 /**@brief Put reference to i-node.
  * @param ref Pointer for reference to be put back
@@ -143,11 +148,11 @@ int ext4_fs_put_inode_ref(struct ext4_inode_ref *ref);
 /**@brief Allocate new i-node in the filesystem.
  * @param fs        Filesystem to allocated i-node on
  * @param inode_ref Output pointer to return reference to allocated i-node
- * @param flags     Flags to be set for newly created i-node
+ * @param filetype  File type of newly created i-node
  * @return Error code
  */
 int ext4_fs_alloc_inode(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref,
-                        bool is_directory);
+                       int filetype);
 
 /**@brief Release i-node and mark it as free.
  * @param inode_ref I-node to be released
@@ -169,7 +174,7 @@ int ext4_fs_truncate_inode(struct ext4_inode_ref *inode_ref, uint64_t new_size);
  * @return Error code
  */
 int ext4_fs_get_inode_data_block_index(struct ext4_inode_ref *inode_ref,
-                                       uint64_t iblock, uint32_t *fblock);
+                                      uint64_t iblock, uint32_t *fblock);
 
 /**@brief Set physical block address for the block logical address into the
  * i-node.
@@ -179,7 +184,7 @@ int ext4_fs_get_inode_data_block_index(struct ext4_inode_ref *inode_ref,
  * @return Error code
  */
 int ext4_fs_set_inode_data_block_index(struct ext4_inode_ref *inode_ref,
-                                       uint64_t iblock, uint32_t fblock);
+                                      uint64_t iblock, uint32_t fblock);
 
 /**@brief Release data block from i-node
  * @param inode_ref I-node to release block from
@@ -187,7 +192,7 @@ int ext4_fs_set_inode_data_block_index(struct ext4_inode_ref *inode_ref,
  * @return Error code
  */
 int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
-                                uint32_t iblock);
+                               uint32_t iblock);
 
 /**@brief Append following logical block to the i-node.
  * @param inode_ref I-node to append block to
@@ -196,7 +201,7 @@ int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
  * @return Error code
  */
 int ext4_fs_append_inode_block(struct ext4_inode_ref *inode_ref,
-                               uint32_t *fblock, uint32_t *iblock);
+                              uint32_t *fblock, uint32_t *iblock);
 
 /**@brief   Increment inode link count.
  * @param   inode none handle