X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Flib%2Futil.c;h=671f97ee271407a5a194935360e4aad4ab75027f;hb=0565a00a4cfdabd325bf2e117620d5f15dd46cda;hp=0fb8937962b2e08d3bade17dca2128c83d3580a7;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303;p=elogind.git

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 0fb893796..671f97ee2 100644
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -352,7 +352,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 {
 	ssize_t buf_len;
 
-	info("get buffer off 0x%llx(%llu), len 0x%zx\n", (unsigned long long) off, (unsigned long long) off, len);
+	info("get buffer off 0x%" PRIx64 "(%" PRIu64 "), len 0x%zx\n", off, off, len);
 	/* check if requested area fits in superblock buffer */
 	if (off + len <= SB_BUFFER_SIZE) {
 		if (id->sbbuf == NULL) {
@@ -365,7 +365,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
 		/* check if we need to read */
 		if ((off + len) > id->sbbuf_len) {
-			info("read sbbuf len:0x%llx\n", (unsigned long long) (off + len));
+			info("read sbbuf len:0x%" PRIx64 "\n", (off + len));
 			if (lseek(id->fd, 0, SEEK_SET) < 0) {
 				dbg("lseek failed (%s)\n", strerror(errno));
 				return NULL;
@@ -401,7 +401,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
 		/* check if we need to read */
 		if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
-			info("read seekbuf off:0x%llx len:0x%zx\n", (unsigned long long) off, len);
+			info("read seekbuf off:0x%" PRIx64 " len:0x%zx\n", off, len);
 			if (lseek(id->fd, off, SEEK_SET) < 0) {
 				dbg("lseek failed (%s)\n", strerror(errno));
 				return NULL;