RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd-fuse: fix printf format for off_t and size_t

Browse Source 
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>
This commit is contained in:
Danny Al-Gaaf 2013-01-28 16:33:44 +01:00 committed by Sage Weil
parent 21673e8b9e
commit 818e9a2cd4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rbd_fuse/rbd-fuse.c
View File

@ -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);