Module Name: src
Committed By: manu
Date: Mon Sep 6 01:17:05 UTC 2010
Modified Files:
src/lib/libperfuse: ops.c perfuse_if.h perfuse_priv.h
Log Message:
build fixes for LP64
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libperfuse/perfuse_if.h
cvs rdiff -u -r1.6 -r1.7 src/lib/libperfuse/perfuse_priv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.9 src/lib/libperfuse/ops.c:1.10
--- src/lib/libperfuse/ops.c:1.9 Sun Sep 5 06:49:13 2010
+++ src/lib/libperfuse/ops.c Mon Sep 6 01:17:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.9 2010/09/05 06:49:13 manu Exp $ */
+/* $NetBSD: ops.c,v 1.10 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -416,7 +416,7 @@
fd_offset = 0;
written = 0;
dents = PERFUSE_NODE_DATA(opc)->pnd_dirent;
- dents_len = PERFUSE_NODE_DATA(opc)->pnd_dirent_len;
+ dents_len = (size_t)PERFUSE_NODE_DATA(opc)->pnd_dirent_len;
do {
char *ndp;
@@ -569,7 +569,8 @@
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags & PDF_READDIR)
- DPRINTF("%s: readoff = %"PRId64", pnd->pnd_dirent_len = %zd\n",
+ DPRINTF("%s: readoff = %"PRId64", "
+ "pnd->pnd_dirent_len = %"PRId64"\n",
__func__, *readoff, pnd->pnd_dirent_len);
#endif
if (*readoff >= pnd->pnd_dirent_len) {
@@ -1067,7 +1068,7 @@
pm = ps->ps_new_msg(pu, opc, FUSE_MKNOD, len, pcn->pcn_cred);
fmi = GET_INPAYLOAD(ps, pm, fuse_mknod_in);
fmi->mode = vap->va_mode | VTTOIF(vap->va_type);
- fmi->rdev = vap->va_rdev;
+ fmi->rdev = (uint32_t)vap->va_rdev;
fmi->umask = 0; /* Seems unused bu libfuse */
(void)strlcpy((char *)(void *)(fmi + 1), path, len - sizeof(*fmi));
Index: src/lib/libperfuse/perfuse_if.h
diff -u src/lib/libperfuse/perfuse_if.h:1.4 src/lib/libperfuse/perfuse_if.h:1.5
--- src/lib/libperfuse/perfuse_if.h:1.4 Wed Sep 1 14:57:24 2010
+++ src/lib/libperfuse/perfuse_if.h Mon Sep 6 01:17:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_if.h,v 1.4 2010/09/01 14:57:24 manu Exp $ */
+/* $NetBSD: perfuse_if.h,v 1.5 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -153,7 +153,7 @@
size_t pmo_source_len;
size_t pmo_target_len;
size_t pmo_filesystemtype_len;
- int pmo_mountflags;
+ long pmo_mountflags;
size_t pmo_data_len;
};
Index: src/lib/libperfuse/perfuse_priv.h
diff -u src/lib/libperfuse/perfuse_priv.h:1.6 src/lib/libperfuse/perfuse_priv.h:1.7
--- src/lib/libperfuse/perfuse_priv.h:1.6 Sun Sep 5 06:49:13 2010
+++ src/lib/libperfuse/perfuse_priv.h Mon Sep 6 01:17:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_priv.h,v 1.6 2010/09/05 06:49:13 manu Exp $ */
+/* $NetBSD: perfuse_priv.h,v 1.7 2010/09/06 01:17:05 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -88,7 +88,7 @@
uint64_t pnd_offset; /* seek state */
uint64_t pnd_lock_owner;
struct dirent *pnd_dirent; /* native buffer for readdir */
- size_t pnd_dirent_len;
+ off_t pnd_dirent_len;
struct fuse_dirent *pnd_all_fd; /* FUSE buffer for readdir */
size_t pnd_all_fd_len;
TAILQ_HEAD(,perfuse_cc_queue) pnd_pcq; /* queued requests */
