Fixed i386 compilation warnings and errors

reverbrain · Jan 27, 2017 · a9b0be6 · a9b0be6
1 parent 80e5b87
commit a9b0be6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/library/index.c b/library/index.c
@@ -435,7 +435,7 @@ static int eblob_find_on_disk(struct eblob_backend *b,
 
 	sorted_orig = bsearch(dc, search_start, num, sizeof(struct eblob_disk_control), eblob_disk_control_sort);
 
-	eblob_log(b->cfg.log, EBLOB_LOG_SPAM, "%s: position: %" PRIu64 ", block_size: %" PRIu64 ", index_size: %zd, num: %zu\n",
+	eblob_log(b->cfg.log, EBLOB_LOG_SPAM, "%s: position: %" PRIu64 ", block_size: %zd, index_size: %" PRIu64 ", num: %zu\n",
 			eblob_dump_id(dc->key.id),
 			hdr_block_offset, hdr_block_size, bctl->index_ctl.size, num);
 
@@ -483,7 +483,7 @@ static int eblob_find_on_disk(struct eblob_backend *b,
 			if (read_err < 0) {
 				err = read_err;
 				eblob_log(b->cfg.log, EBLOB_LOG_ERROR, "%s: index: %d, position: %" PRIu64
-						", block_size: %" PRIu64 ", blob_size: %zd, num: %zu, FAILED: %s: %d.\n",
+						", block_size: %zd, blob_size: %" PRIu64 ", num: %zu, FAILED: %s: %d.\n",
 					  eblob_dump_id(dc->key.id),
 					  bctl->index_ctl.fd, hdr_block_offset, hdr_block_size,
 					  bctl->index_ctl.size, num, strerror(-err), err);
@@ -532,7 +532,7 @@ static int eblob_find_on_disk(struct eblob_backend *b,
 		if (read_err < 0) {
 			err = read_err;
 			eblob_log(b->cfg.log, EBLOB_LOG_ERROR, "%s: index: %d, position: %" PRIu64
-					", block_size: %" PRIu64 ", blob_size: %zd, num: %zu, FAILED: %s: %d.\n",
+					", block_size: %zd, blob_size: %" PRIu64 ", num: %zu, FAILED: %s: %d.\n",
 				  eblob_dump_id(dc->key.id),
 				  bctl->index_ctl.fd, hdr_block_offset, hdr_block_size,
 				  bctl->index_ctl.size, num, strerror(-err), err);

diff --git a/library/json_stat.cpp b/library/json_stat.cpp
@@ -216,7 +216,7 @@ static void eblob_stat_vfs(struct eblob_backend *b, rapidjson::Value &stat, rapi
 	stat.AddMember("favail", s.f_favail, allocator);
 	stat.AddMember("fsid", s.f_fsid, allocator);
 	stat.AddMember("flag", s.f_flag, allocator);
-	stat.AddMember("namemax", s.f_namemax, allocator);
+	stat.AddMember("namemax", (uint64_t)s.f_namemax, allocator);
 }
 
 int eblob_json_stat_init(struct eblob_backend *b) {
@@ -313,8 +313,8 @@ static int eblob_stat_add_timeout_error(struct eblob_backend *b, std::string &js
 		rapidjson::Value error(rapidjson::kObjectType);
 		error.AddMember("code", ETIMEDOUT, allocator);
 		error.AddMember("message", error_message, allocator);
-		error.AddMember("lifetime", lifetime, allocator);
-		error.AddMember("lifetime_limit", get_lifetime_limit(b), allocator);
+		error.AddMember("lifetime", (uint64_t)lifetime, allocator);
+		error.AddMember("lifetime_limit", (uint64_t)get_lifetime_limit(b), allocator);
 		eblob_stat_add_timestamp_raw(error, "current_timestamp", current_tv, allocator);
 		doc.AddMember("error", error, allocator);