resolved conflicts for merge of 74da0434 to master

Change-Id: I0a7745ecf65a2188c32e7bf2e89fe93259c71b83

1 files changed, 9 insertions, 8 deletions

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index d6723781..1c254571 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -366,9 +367,9 @@ void reset_ext4fs_info() {
 	memset(&info, 0, sizeof(info));
 	memset(&aux_info, 0, sizeof(aux_info));
 
-	if (info.sparse_file) {
-		sparse_file_destroy(info.sparse_file);
-		info.sparse_file = NULL;
+	if (ext4_sparse_file) {
+		sparse_file_destroy(ext4_sparse_file);
+		ext4_sparse_file = NULL;
 	}
 }
 
@@ -535,7 +536,7 @@ int make_ext4fs_internal(int fd, const char *_directory,
 	info.bg_desc_reserve_blocks = compute_bg_desc_reserve_blocks();
 
 	printf("Creating filesystem with parameters:\n");
-	printf("    Size: %llu\n", info.len);
+	printf("    Size: %"PRIu64"\n", info.len);
 	printf("    Block size: %d\n", info.block_size);
 	printf("    Blocks per group: %d\n", info.blocks_per_group);
 	printf("    Inodes per group: %d\n", info.inodes_per_group);
@@ -545,11 +546,11 @@ int make_ext4fs_internal(int fd, const char *_directory,
 
 	ext4_create_fs_aux_info();
 
-	printf("    Blocks: %llu\n", aux_info.len_blocks);
+	printf("    Blocks: %"PRIu64"\n", aux_info.len_blocks);
 	printf("    Block groups: %d\n", aux_info.groups);
 	printf("    Reserved block group size: %d\n", info.bg_desc_reserve_blocks);
 
-	info.sparse_file = sparse_file_new(info.block_size, info.len);
+	ext4_sparse_file = sparse_file_new(info.block_size, info.len);
 
 	block_allocator_init();
 
@@ -611,8 +612,8 @@ int make_ext4fs_internal(int fd, const char *_directory,
 
 	write_ext4_image(fd, gzip, sparse, crc);
 
-	sparse_file_destroy(info.sparse_file);
-	info.sparse_file = NULL;
+	sparse_file_destroy(ext4_sparse_file);
+	ext4_sparse_file = NULL;
 
 	free(mountpoint);
 	free(directory);