Merge "Use stdint.h instead" am: a4342e7599

am: 49ccf3ad1b

Change-Id: If4ccde236519722d0a7da8a04bc81a17496d1e53

2 files changed, 29 insertions, 31 deletions

diff --git a/f2fs_utils/f2fs_sparseblock.c b/f2fs_utils/f2fs_sparseblock.c
index 27225c62..95268d0e 100644
--- a/f2fs_utils/f2fs_sparseblock.c
+++ b/f2fs_utils/f2fs_sparseblock.c
@@ -2,6 +2,8 @@
 
 #define LOG_TAG "f2fs_sparseblock"
 
+#include "f2fs_sparseblock.h"
+
 #include <errno.h>
 #include <f2fs_fs.h>
 #include <fcntl.h>
@@ -14,8 +16,6 @@
 
 #include <log/log.h>
 
-#include "f2fs_sparseblock.h"
-
 #define D_DISP_u32(ptr, member)           \
   do {                \
     SLOGD("%-30s" "\t\t[0x%#08x : %u]\n",    \
@@ -216,7 +216,7 @@ static struct f2fs_checkpoint *validate_checkpoint(block_t cp_addr,
 {
     unsigned char *cp_block_1, *cp_block_2;
     struct f2fs_checkpoint *cp_block, *cp_ret;
-    u64 cp1_version = 0, cp2_version = 0;
+    uint64_t cp1_version = 0, cp2_version = 0;
 
     cp_block_1 = malloc(F2FS_BLKSIZE);
     if (!cp_block_1)
@@ -314,10 +314,10 @@ fail_no_cp:
 
 static int gather_sit_info(int fd, struct f2fs_info *info)
 {
-    u64 num_segments = (info->total_blocks - info->main_blkaddr
+    uint64_t num_segments = (info->total_blocks - info->main_blkaddr
             + info->blocks_per_segment - 1) / info->blocks_per_segment;
-    u64 num_sit_blocks = (num_segments + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK;
-    u64 sit_block;
+    uint64_t num_sit_blocks = (num_segments + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK;
+    uint64_t sit_block;
 
     info->sit_blocks = malloc(num_sit_blocks * sizeof(struct f2fs_sit_block));
     if (!info->sit_blocks)
@@ -345,7 +345,7 @@ static inline int is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f)
     return !!(ckpt_flags & f);
 }
 
-static inline u64 sum_blk_addr(struct f2fs_checkpoint *cp, struct f2fs_info *info, int base, int type)
+static inline uint64_t sum_blk_addr(struct f2fs_checkpoint *cp, struct f2fs_info *info, int base, int type)
 {
     return info->cp_valid_cp_blkaddr + le32_to_cpu(cp->cp_pack_total_block_count)
                 - (base + 1) + type;
@@ -365,7 +365,7 @@ static int get_sit_summary(int fd, struct f2fs_info *info, struct f2fs_checkpoin
             return -1;
         memcpy(&info->sit_sums->journal.n_sits, &buffer[SUM_JOURNAL_SIZE], SUM_JOURNAL_SIZE);
     } else {
-        u64 blk_addr;
+        uint64_t blk_addr;
         if (is_set_ckpt_flags(cp, CP_UMOUNT_FLAG))
             blk_addr = sum_blk_addr(cp, info, NR_CURSEG_TYPE, CURSEG_COLD_DATA);
         else
@@ -470,7 +470,7 @@ void free_f2fs_info(struct f2fs_info *info)
     free(info);
 }
 
-u64 get_num_blocks_used(struct f2fs_info *info)
+uint64_t get_num_blocks_used(struct f2fs_info *info)
 {
     return info->main_blkaddr + info->total_user_used;
 }
@@ -485,11 +485,11 @@ int f2fs_test_bit(unsigned int nr, const char *p)
     return (mask & *addr) != 0;
 }
 
-int run_on_used_blocks(u64 startblock, struct f2fs_info *info, int (*func)(u64 pos, void *data), void *data) {
+int run_on_used_blocks(uint64_t startblock, struct f2fs_info *info, int (*func)(uint64_t pos, void *data), void *data) {
     struct f2fs_sit_block sit_block_cache;
     struct f2fs_sit_entry * sit_entry;
-    u64 sit_block_num_cur = 0, segnum = 0, block_offset;
-    u64 block;
+    uint64_t sit_block_num_cur = 0, segnum = 0, block_offset;
+    uint64_t block;
     unsigned int used, found, started = 0, i;
 
     block = startblock;
@@ -555,7 +555,7 @@ struct privdata
  * filesystem, replacing blocks identified as unused with 0's.
  */
 
-int copy_used(u64 pos, void *data)
+int copy_used(uint64_t pos, void *data)
 {
     struct privdata *d = data;
     char *buf;
diff --git a/f2fs_utils/f2fs_sparseblock.h b/f2fs_utils/f2fs_sparseblock.h
index 0a0dab47..e5c5f846 100644
--- a/f2fs_utils/f2fs_sparseblock.h
+++ b/f2fs_utils/f2fs_sparseblock.h
@@ -17,14 +17,12 @@
 #ifndef F2FS_UTILS_F2F2_UTILS_H_
 #define F2FS_UTILS_F2F2_UTILS_H_
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-
-
 #define ver_after(a, b) (typecheck(unsigned long long, a) &&            \
     typecheck(unsigned long long, b) &&                     \
     ((long long)((a) - (b)) > 0))
@@ -37,35 +35,35 @@ struct f2fs_sit_block;
 struct f2fs_summary_block;
 
 struct f2fs_info {
-    u_int64_t blocks_per_segment;
-    u_int32_t block_size;
+    uint64_t blocks_per_segment;
+    uint32_t block_size;
 
     char *sit_bmp;
-    u_int32_t sit_bmp_size;
-    u_int64_t blocks_per_sit;
+    uint32_t sit_bmp_size;
+    uint64_t blocks_per_sit;
     struct f2fs_sit_block *sit_blocks;
     struct f2fs_summary_block *sit_sums;
 
-    u_int64_t cp_blkaddr;
-    u_int64_t cp_valid_cp_blkaddr;
+    uint64_t cp_blkaddr;
+    uint64_t cp_valid_cp_blkaddr;
 
-    u_int64_t sit_blkaddr;
+    uint64_t sit_blkaddr;
 
-    u_int64_t nat_blkaddr;
+    uint64_t nat_blkaddr;
 
-    u_int64_t ssa_blkaddr;
+    uint64_t ssa_blkaddr;
 
-    u_int64_t main_blkaddr;
+    uint64_t main_blkaddr;
 
-    u_int64_t total_user_used;
-    u_int64_t total_blocks;
+    uint64_t total_user_used;
+    uint64_t total_blocks;
 };
 
-u64 get_num_blocks_used(struct f2fs_info *info);
+uint64_t get_num_blocks_used(struct f2fs_info *info);
 struct f2fs_info *generate_f2fs_info(int fd);
 void free_f2fs_info(struct f2fs_info *info);
 unsigned int get_f2fs_filesystem_size_sec(char *dev);
-int run_on_used_blocks(u64 startblock, struct f2fs_info *info, int (*func)(u64 pos, void *data), void *data);
+int run_on_used_blocks(uint64_t startblock, struct f2fs_info *info, int (*func)(uint64_t pos, void *data), void *data);
 
 #ifdef __cplusplus
 }