Fix several issues when compiling for 64bit systems

Signed-off-by: Josh Boyer <jwboyer@gmail.com>

7 files changed, 20 insertions, 19 deletions

diff --git a/ubi-utils/src/hashmap.c b/ubi-utils/src/hashmap.c
index 250f71f..3511d56 100644
--- a/ubi-utils/src/hashmap.c
+++ b/ubi-utils/src/hashmap.c
@@ -323,7 +323,7 @@ hashmap_dump(hashmap_t map)
 
 	for(i = 0; i < map->maxsize; i++) {
 		if (map->data[i] != NULL) {
-			printf("[%d]: ", i);
+			printf("[%zd]: ", i);
 			print_all(map->data[i]);
 		}
 	}
diff --git a/ubi-utils/src/libubi.c b/ubi-utils/src/libubi.c
index 979f157..7cb74bf 100644
--- a/ubi-utils/src/libubi.c
+++ b/ubi-utils/src/libubi.c
@@ -698,8 +698,8 @@ ubi_vol_update(int vol_fd, unsigned long long bytes)
 	err = ioctl(vol_fd, UBI_IOCVOLUP, &bytes);
 	if (err) {
 		ubi_err("%s failure calling update ioctl\n"
-			"    IOCTL(%08x) err=%d errno=%d\n",
-			__func__, UBI_IOCVOLUP, err, errno);
+			"    IOCTL(%08lx) err=%d errno=%d\n",
+			__func__, (long unsigned int)UBI_IOCVOLUP, err, errno);
 	}
 	return err;
 }
diff --git a/ubi-utils/src/nand2bin.c b/ubi-utils/src/nand2bin.c
index 636ee6f..b8e4ea3 100644
--- a/ubi-utils/src/nand2bin.c
+++ b/ubi-utils/src/nand2bin.c
@@ -203,7 +203,7 @@ process_page(uint8_t* buf, uint8_t *oobbuf, size_t pagesize)
 	case 2048: oobsize = 64; eccpoi = 64 / 2; break;
 	case 512:  oobsize = 16; eccpoi = 16 / 2; break;
 	default:
-		fprintf(stderr, "Unsupported page size: %d\n", pagesize);
+		fprintf(stderr, "Unsupported page size: %zd\n", pagesize);
 		return -EINVAL;
 	}
 	memset(oobbuf, 0xff, oobsize);
diff --git a/ubi-utils/src/pfi.c b/ubi-utils/src/pfi.c
index 7b57559..fa835e2 100644
--- a/ubi-utils/src/pfi.c
+++ b/ubi-utils/src/pfi.c
@@ -253,7 +253,7 @@ int pfi_header_setvalue (pfi_header head,
 {
 	int key_id = find_key_by_name(key);
 
-	if ((uint32_t)value == (uint32_t)NULL)
+	if (value == NULL)
 		return PFI_EINSUFF;
 
 	if ((key_id < 0) || (key_id >= num_keys))
diff --git a/ubi-utils/src/reader.c b/ubi-utils/src/reader.c
index 975caa1..7935a15 100644
--- a/ubi-utils/src/reader.c
+++ b/ubi-utils/src/reader.c
@@ -178,7 +178,8 @@ read_pfi_raw(pfi_header pfi_hd, FILE* fp_pfi __unused, pfi_raw_t* pfi_raw,
 	}
 
 	rc = bootenv_list_to_num_vector(raw_start_list,
-					&(res->starts_size), &(res->starts));
+					(void *) &(res->starts_size),
+					&(res->starts));
 	if (rc != 0) {
 		EBUF_PFI("Cannot create numeric value array: %s", tmp_str);
 		goto err;
@@ -246,7 +247,7 @@ read_pfi_ubi(pfi_header pfi_hd, FILE* fp_pfi __unused, pfi_ubi_t* pfi_ubi,
 		goto err;
 	}
 
-	rc = bootenv_list_to_num_vector(ubi_id_list, &(res->ids_size),
+	rc = bootenv_list_to_num_vector(ubi_id_list, (void *) &(res->ids_size),
 					&(res->ids));
 	if (rc != 0) {
 		EBUF_PFI("Cannot create numeric value array: %s", tmp_str);
@@ -298,7 +299,7 @@ read_pfi_ubi(pfi_header pfi_hd, FILE* fp_pfi __unused, pfi_ubi_t* pfi_ubi,
 		EBUF_PFI("Cannot translate PFI value: %s", tmp_str);
 		goto err;
 	}
-	rc = bootenv_list_to_vector(ubi_name_list, &(res->names_size),
+	rc = bootenv_list_to_vector(ubi_name_list, (void *) &(res->names_size),
 				    &(tmp_names));
 	if (rc != 0) {
 		EBUF_PFI("Cannot create string array: %s", tmp_str);
diff --git a/ubi-utils/src/unubi.c b/ubi-utils/src/unubi.c
index cade1e1..811a6db 100644
--- a/ubi-utils/src/unubi.c
+++ b/ubi-utils/src/unubi.c
@@ -102,7 +102,7 @@ static const char *usage =
 #define FN_INVAL	"%s/eb%04u%s"			/* invalid eraseblock */
 #define FN_NSURE	"%s/eb%04u_%03u_%03u_%03x%s"	/* unsure eraseblock */
 #define FN_VALID	"%s/eb%04u_%03u_%03u_%03x%s"	/* valid eraseblock */
-#define FN_VOLSP	"%s/vol%03u_%03u_%03u_%04u"	/* split volume */
+#define FN_VOLSP	"%s/vol%03u_%03u_%03u_%04zu"	/* split volume */
 #define FN_VOLWH	"%s/volume%03u"			/* whole volume */
 
 static uint32_t crc32_table[256];
diff --git a/ubi-utils/src/unubi_analyze.c b/ubi-utils/src/unubi_analyze.c
index 2e94ca9..6009fc0 100644
--- a/ubi-utils/src/unubi_analyze.c
+++ b/ubi-utils/src/unubi_analyze.c
@@ -167,9 +167,9 @@ unubi_analyze_ec_hdr(eb_info_t first, const char *path)
 		    (crc != ubi32_to_cpu(cur->outer.hdr_crc)))
 			fprintf(fpdata, "# ");
 
-		fprintf(fpdata, "%u %llu %llu", count,
-			ubi64_to_cpu(cur->outer.ec),
-			erase_counts[count]);
+		fprintf(fpdata, "%zu %llu %llu", count,
+			(unsigned long long) ubi64_to_cpu(cur->outer.ec),
+			(unsigned long long) erase_counts[count]);
 
 		if (ubi32_to_cpu(cur->outer.magic) != UBI_EC_HDR_MAGIC)
 			fprintf(fpdata, " ## bad magic: %08x",
@@ -198,7 +198,7 @@ unubi_analyze_ec_hdr(eb_info_t first, const char *path)
 		if ((count % EC_X_INT) == 0) {
 			if (count > 0)
 				fprintf(fpplot, ", ");
-			fprintf(fpplot, "%d", count);
+			fprintf(fpplot, "%zd", count);
 		}
 
 		cur = cur->next;
@@ -207,9 +207,9 @@ unubi_analyze_ec_hdr(eb_info_t first, const char *path)
 	fprintf(fpplot, ")\n");
 
 	fprintf(fpplot, "set ylabel \"erase count\"\n");
-	fprintf(fpplot, "set xrange [-1:%u]\n", eraseblocks + 1);
+	fprintf(fpplot, "set xrange [-1:%zu]\n", eraseblocks + 1);
 	fprintf(fpplot, "# set yrange [-1:%llu]\n",
-		erase_counts[eraseblocks - 1] + 1);
+		(unsigned long long) erase_counts[eraseblocks - 1] + 1);
 	fprintf(fpplot, "plot \"%s\" u 1:2 t \"unsorted: %s\" with boxes\n",
 		FN_EH_DATA, FN_EH_DATA);
 	fprintf(fpplot, "# replot \"%s\" u 1:3 t \"sorted: %s\" with lines\n",
@@ -299,7 +299,7 @@ unubi_analyze_vid_hdr(eb_info_t *head, const char *path)
 		if ((y1 == -1) || (y2 == -1))
 			return -1;
 
-		fprintf(fpdata, "%u %u %u   %u %u   %u %u\n",
+		fprintf(fpdata, "%zu %u %u   %u %u   %u %u\n",
 			count,
 			ubi32_to_cpu(cur->inner.vol_id),
 			ubi32_to_cpu(cur->inner.lnum),
@@ -325,10 +325,10 @@ unubi_analyze_vid_hdr(eb_info_t *head, const char *path)
 			fprintf(fpplot, ", ");
 		if (step != ubi32_to_cpu(cur->inner.vol_id)) {
 			step = ubi32_to_cpu(cur->inner.vol_id);
-			fprintf(fpplot, "\"%d\" %d 0", step, count);
+			fprintf(fpplot, "\"%zd\" %zd 0", step, count);
 		}
 		else
-			fprintf(fpplot, "\"%d\" %d 1",
+			fprintf(fpplot, "\"%d\" %zd 1",
 				ubi32_to_cpu(cur->inner.lnum), count);
 		cur = cur->next;
 		count++;
@@ -384,7 +384,7 @@ unubi_analyze_vid_hdr(eb_info_t *head, const char *path)
 
 	y1 = norm_index(leb_versions[breadth - 1], leb_versions, breadth);
 	y2 = norm_index(data_sizes[breadth - 1], data_sizes, breadth);
-	fprintf(fpplot, "set xrange [-1:%u]\n", count + 1);
+	fprintf(fpplot, "set xrange [-1:%zu]\n", count + 1);
 	fprintf(fpplot, "set yrange [-1:%u]\n", y1 + 1);
 	fprintf(fpplot, "set y2range [-1:%u]\n", y2 + 1);
 	fprintf(fpplot, "plot \"%s\" u 1:4 t \"leb version: %s\" "