From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 28 Jan 2013 15:33:44 +0000 (+0100)
Subject: rbd-fuse: fix printf format for off_t and size_t
X-Git-Tag: v0.57~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=818e9a2cd4b3085476e36ca5305d226178383741;p=ceph.git

rbd-fuse: fix printf format for off_t and size_t

Fix printf format for off_t and size_t to print the same on 32 and 64bit
systems. Use PRI* macros from inttypes.h.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rbd_fuse/rbd-fuse.c b/src/rbd_fuse/rbd-fuse.c
index c204463b878..748976aabaf 100644
--- a/src/rbd_fuse/rbd-fuse.c
+++ b/src/rbd_fuse/rbd-fuse.c
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <inttypes.h>
 
 #include "include/rbd/librbd.h"
 
@@ -321,7 +322,7 @@ static int rbdfs_write(const char *path, const char *buf, size_t size,
 
 		if (offset + size > rbdsize(fi->fh)) {
 			int r;
-			fprintf(stderr, "rbdfs_write resizing %s to 0x%lx\n",
+			fprintf(stderr, "rbdfs_write resizing %s to 0x%"PRIxMAX"\n",
 				path, offset+size);
 			r = rbd_resize(rbd->image, offset+size);
 			if (r < 0)
@@ -516,7 +517,7 @@ rbdfs_truncate(const char *path, off_t size)
 		return -ENOENT;
 
 	rbd = &opentbl[fd];
-	fprintf(stderr, "truncate %s to %ld (0x%lx)\n", path, size, size);
+	fprintf(stderr, "truncate %s to %"PRIdMAX" (0x%"PRIxMAX")\n", path, size, size);
 	r = rbd_resize(rbd->image, size);
 	if (r < 0)
 		return r;
@@ -559,7 +560,7 @@ rbdfs_setxattr(const char *path, const char *name, const char *value,
 	for (ap = attrs; ap->attrname != NULL; ap++) {
 		if (strcmp(name, ap->attrname) == 0) {
 			*ap->attrvalp = strtoull(value, NULL, 0);
-			fprintf(stderr, "rbd-fuse: %s set to 0x%lx\n",
+			fprintf(stderr, "rbd-fuse: %s set to 0x%"PRIx64"\n",
 				ap->attrname, *ap->attrvalp);
 			return 0;
 		}
@@ -578,7 +579,7 @@ rbdfs_getxattr(const char *path, const char *name, char *value,
 
 	for (ap = attrs; ap->attrname != NULL; ap++) {
 		if (strcmp(name, ap->attrname) == 0) {
-			sprintf(buf, "%lu", *ap->attrvalp);
+			sprintf(buf, "%"PRIu64, *ap->attrvalp);
 			if (value != NULL && size >= strlen(buf))
 				strcpy(value, buf);
 			fprintf(stderr, "rbd-fuse: get %s\n", ap->attrname);