diff options
| author | Colin Cross <ccross@android.com> | 2016-09-30 01:19:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-30 01:19:12 +0000 |
| commit | 5b558497869bbaf7ae7a511e730dd2e1ae083ff4 (patch) | |
| tree | 8b9241b87eaf691cc55d42fd07bbee939f180b04 /ext4_utils/make_ext4fs.c | |
| parent | 78d0e95371f1096908d52f3b62bd369aabd1359f (diff) | |
| parent | 2108b3a3739c460c81bc3fbae132db29dde67abc (diff) | |
| download | extras-5b558497869bbaf7ae7a511e730dd2e1ae083ff4.tar.gz | |
Merge "Revert "ext4_utils: -Werror"" am: 3e3353e88f am: 884bf31b61
am: 2108b3a373
Change-Id: I0047aac1fc06b93c04e71b15e12d5d3cbdb4d0cb
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index bc8ea3a3..f45a6990 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -79,9 +79,7 @@ #endif -#ifndef MAX_PATH #define MAX_PATH 4096 -#endif #define MAX_BLK_MAPPING_STR 1000 const int blk_file_major_ver = 1; @@ -535,7 +533,7 @@ static int compare_chunks(const void* chunk1, const void* chunk2) { } static int get_block_group(u32 block) { - unsigned i, group = 0; + int i, group = 0; for(i = 0; i < aux_info.groups; i++) { if (block >= aux_info.bgs[i].first_block) group = i; @@ -556,8 +554,7 @@ static void extract_base_fs_allocations(const char *directory, const char *mount char stored_file_name[MAX_PATH], real_file_name[MAX_PATH], file_map[MAX_BLK_MAPPING_STR]; struct block_allocation *fs_alloc; struct block_group_info *bgs = aux_info.bgs; - unsigned i; - int major_version = 0, minor_version = 0; + int i, major_version = 0, minor_version = 0; char *base_file_line = NULL; size_t base_file_line_len = 0; @@ -628,8 +625,8 @@ static void extract_base_fs_allocations(const char *directory, const char *mount } block_range = strtok_r(NULL, ",", &end_string); int bg_first_block = bgs[block_group].first_block; - unsigned min_bg_bound = bgs[block_group].chunks[0].block + bgs[block_group].chunks[0].len; - unsigned max_bg_bound = bgs[block_group].chunks[bgs[block_group].chunk_count - 1].block; + int min_bg_bound = bgs[block_group].chunks[0].block + bgs[block_group].chunks[0].len; + int max_bg_bound = bgs[block_group].chunks[bgs[block_group].chunk_count - 1].block; if (min_bg_bound >= start_block - bg_first_block || max_bg_bound <= end_block - bg_first_block) { |