diff options
| author | rees <rees@FreeBSD.org> | 2004-03-26 22:44:59 +0000 |
|---|---|---|
| committer | rees <rees@FreeBSD.org> | 2004-03-26 22:44:59 +0000 |
| commit | d5e8f62700d6cc71bdc98dcce5c75443c6b4a22b (patch) | |
| tree | 79ec30a39d066c7111d98ec0e181fa30e730ebce | |
| parent | b05f0288daadcb0b82d507b42a40665165b146ba (diff) | |
| download | FreeBSD-src-d5e8f62700d6cc71bdc98dcce5c75443c6b4a22b.zip FreeBSD-src-d5e8f62700d6cc71bdc98dcce5c75443c6b4a22b.tar.gz | |
fix for 64-bit arch:
use %zd to print size_t types and sizeof()
Approved by: alfred
Tested on: sparc64, amd64
| -rw-r--r-- | sbin/idmapd/idmapd.c | 5 | ||||
| -rw-r--r-- | sys/nfs4client/nfs4_dev.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c index 809f7b4..e32c383 100644 --- a/sbin/idmapd/idmapd.c +++ b/sbin/idmapd/idmapd.c @@ -215,7 +215,7 @@ idmap_service(struct idmap_e * e) } if (e->msg.msg_len != sizeof(struct idmap_msg)) { - fprintf(stderr, "bad message length: %d/%d\n", e->msg.msg_len, + fprintf(stderr, "bad message length: %zd/%zd\n", e->msg.msg_len, sizeof(struct idmap_msg)); return -1; } @@ -355,9 +355,6 @@ main(int argc, char ** argv) if (!verbose) daemon(0,0); - if (verbose) - printf("sizeof nfs4dev_msg: %d\n", sizeof(struct nfs4dev_msg)); - maxfd = fd; for (;;) { struct timeval timo = {1, 0}; diff --git a/sys/nfs4client/nfs4_dev.h b/sys/nfs4client/nfs4_dev.h index 218f1de..4d4817c 100644 --- a/sys/nfs4client/nfs4_dev.h +++ b/sys/nfs4client/nfs4_dev.h @@ -47,7 +47,7 @@ struct nfs4dev_msg { uint8_t msg_data[NFS4DEV_MSG_MAX_DATALEN]; }; -#define NFS4DEV_VERSION (0x3 << 16 | sizeof(struct nfs4dev_msg)) +#define NFS4DEV_VERSION (0x3 << 16 | (int) sizeof(struct nfs4dev_msg)) /* ioctl commands */ #define NFS4DEVIOCGET _IOR('A', 0x200, struct nfs4dev_msg) |
