Use stdint.h instead

This commit replaces `u_int32_t`, `u64`, and `u_int64_t` with `uint32_t`
and `uint64_t` defined in C99 <stdint.h>.

Test: cd system/extras/f2fs_utils && mma
Change-Id: I56fd994d94103b3bc416543fbb6fad8b77c503f4

1 files changed, 16 insertions, 18 deletions

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
 }