From c436bce2992aff0935a9280d15de977685590aef Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 20 Feb 2013 21:58:41 +0100 Subject: [PATCH] Fix nodeid format strings --- lib/fuse.c | 15 +++++++++------ lib/fuse_lowlevel.c | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/fuse.c b/lib/fuse.c index 4d9406d..5dd5c09 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -1092,10 +1092,13 @@ static void debug_path(struct fuse *f, const char *msg, fuse_ino_t nodeid, if (wr) wnode = lookup_node(f, nodeid, name); - if (wnode) - fprintf(stderr, "%s %li (w)\n", msg, wnode->nodeid); - else - fprintf(stderr, "%s %li\n", msg, nodeid); + if (wnode) { + fprintf(stderr, "%s %llu (w)\n", + msg, (unsigned long long) wnode->nodeid); + } else { + fprintf(stderr, "%s %llu\n", + msg, (unsigned long long) nodeid); + } } } @@ -2319,8 +2322,8 @@ static int lookup_path(struct fuse *f, fuse_ino_t nodeid, } set_stat(f, e->ino, &e->attr); if (f->conf.debug) - fprintf(stderr, " NODEID: %lu\n", - (unsigned long) e->ino); + fprintf(stderr, " NODEID: %llu\n", + (unsigned long long) e->ino); } } return res; diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 80ad7e8..45cd5f3 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -2411,10 +2411,10 @@ static void fuse_ll_process_buf(void *data, const struct fuse_buf *buf, if (f->debug) { fprintf(stderr, - "unique: %llu, opcode: %s (%i), nodeid: %lu, insize: %zu, pid: %u\n", + "unique: %llu, opcode: %s (%i), nodeid: %llu, insize: %zu, pid: %u\n", (unsigned long long) in->unique, opname((enum fuse_opcode) in->opcode), in->opcode, - (unsigned long) in->nodeid, buf->size, in->pid); + (unsigned long long) in->nodeid, buf->size, in->pid); } req = fuse_ll_alloc_req(f); -- 2.30.2