Module Name: src Committed By: manu Date: Mon Sep 6 01:40:25 UTC 2010
Modified Files: src/lib/libperfuse: ops.c perfuse.c perfuse_if.h perfuse_priv.h src/usr.sbin/perfused: msg.c perfused.c Log Message: More LP64 fixes To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libperfuse/ops.c cvs rdiff -u -r1.3 -r1.4 src/lib/libperfuse/perfuse.c cvs rdiff -u -r1.5 -r1.6 src/lib/libperfuse/perfuse_if.h cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/perfuse_priv.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/perfused/msg.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/perfused/perfused.c 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.10 src/lib/libperfuse/ops.c:1.11 --- src/lib/libperfuse/ops.c:1.10 Mon Sep 6 01:17:05 2010 +++ src/lib/libperfuse/ops.c Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.10 2010/09/06 01:17:05 manu Exp $ */ +/* $NetBSD: ops.c,v 1.11 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. Index: src/lib/libperfuse/perfuse.c diff -u src/lib/libperfuse/perfuse.c:1.3 src/lib/libperfuse/perfuse.c:1.4 --- src/lib/libperfuse/perfuse.c:1.3 Sat Aug 28 03:46:21 2010 +++ src/lib/libperfuse/perfuse.c Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: perfuse.c,v 1.3 2010/08/28 03:46:21 manu Exp $ */ +/* $NetBSD: perfuse.c,v 1.4 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -208,20 +208,20 @@ pmo.pmo_len = sizeof(pmo); - pmo.pmo_len += source ? strlen(source) : 0; - pmo.pmo_len += target ? strlen(target) : 0; - pmo.pmo_len += filesystemtype ? strlen(filesystemtype) : 0; - pmo.pmo_len += data ? strlen(data) : 0; + pmo.pmo_len += source ? (uint32_t)strlen(source) : 0; + pmo.pmo_len += target ? (uint32_t)strlen(target) : 0; + pmo.pmo_len += filesystemtype ? (uint32_t)strlen(filesystemtype) : 0; + pmo.pmo_len += data ? (uint32_t)strlen(data) : 0; pmo.pmo_error = 0; pmo.pmo_unique = (uint64_t)-1; (void)strcpy(pmo.pmo_magic, PERFUSE_MOUNT_MAGIC); - pmo.pmo_source_len = source ? strlen(source) : 0; - pmo.pmo_target_len = target ? strlen(target) : 0; + pmo.pmo_source_len = source ? (uint32_t)strlen(source) : 0; + pmo.pmo_target_len = target ? (uint32_t)strlen(target) : 0; pmo.pmo_filesystemtype_len = - filesystemtype ? strlen(filesystemtype) : 0; - pmo.pmo_mountflags = mountflags; - pmo.pmo_data_len = data ? strlen(data) : 0; + filesystemtype ? (uint32_t)strlen(filesystemtype) : 0; + pmo.pmo_mountflags = (uint32_t)mountflags; + pmo.pmo_data_len = data ? (uint32_t)strlen(data) : 0; if (write(s, &pmo, sizeof(pmo)) != sizeof(pmo)) { Index: src/lib/libperfuse/perfuse_if.h diff -u src/lib/libperfuse/perfuse_if.h:1.5 src/lib/libperfuse/perfuse_if.h:1.6 --- src/lib/libperfuse/perfuse_if.h:1.5 Mon Sep 6 01:17:05 2010 +++ src/lib/libperfuse/perfuse_if.h Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: perfuse_if.h,v 1.5 2010/09/06 01:17:05 manu Exp $ */ +/* $NetBSD: perfuse_if.h,v 1.6 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -146,15 +146,15 @@ * mount request */ struct perfuse_mount_out { - size_t pmo_len; + uint32_t pmo_len; int32_t pmo_error; uint64_t pmo_unique; char pmo_magic[sizeof(PERFUSE_MOUNT_MAGIC)]; - size_t pmo_source_len; - size_t pmo_target_len; - size_t pmo_filesystemtype_len; - long pmo_mountflags; - size_t pmo_data_len; + uint32_t pmo_source_len; + uint32_t pmo_target_len; + uint32_t pmo_filesystemtype_len; + uint32_t pmo_mountflags; + uint32_t pmo_data_len; }; struct perfuse_mount_info { Index: src/lib/libperfuse/perfuse_priv.h diff -u src/lib/libperfuse/perfuse_priv.h:1.7 src/lib/libperfuse/perfuse_priv.h:1.8 --- src/lib/libperfuse/perfuse_priv.h:1.7 Mon Sep 6 01:17:05 2010 +++ src/lib/libperfuse/perfuse_priv.h Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: perfuse_priv.h,v 1.7 2010/09/06 01:17:05 manu Exp $ */ +/* $NetBSD: perfuse_priv.h,v 1.8 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. Index: src/usr.sbin/perfused/msg.c diff -u src/usr.sbin/perfused/msg.c:1.3 src/usr.sbin/perfused/msg.c:1.4 --- src/usr.sbin/perfused/msg.c:1.3 Wed Sep 1 14:57:24 2010 +++ src/usr.sbin/perfused/msg.c Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.c,v 1.3 2010/09/01 14:57:24 manu Exp $ */ +/* $NetBSD: msg.c,v 1.4 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -128,7 +128,7 @@ (void)memset(data, 0, len); fih = (struct fuse_in_header *)data; - fih->len = len; + fih->len = (uint32_t)len; fih->opcode = opcode; fih->unique = perfuse_next_unique(pu); fih->nodeid = nodeid; @@ -606,7 +606,7 @@ int fd; int what; { - if (fd != (int)perfuse_getspecific(pu)) + if (fd != (int)(long)perfuse_getspecific(pu)) DERRX(EX_SOFTWARE, "%s: unexpected notification for fd = %d", __func__, fd); Index: src/usr.sbin/perfused/perfused.c diff -u src/usr.sbin/perfused/perfused.c:1.4 src/usr.sbin/perfused/perfused.c:1.5 --- src/usr.sbin/perfused/perfused.c:1.4 Wed Sep 1 14:57:24 2010 +++ src/usr.sbin/perfused/perfused.c Mon Sep 6 01:40:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: perfused.c,v 1.4 2010/09/01 14:57:24 manu Exp $ */ +/* $NetBSD: perfused.c,v 1.5 2010/09/06 01:40:24 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -137,8 +137,8 @@ } #ifdef PERFUSE_DEBUG - DPRINTF("perfuse lengths: source = %zd, target = %zd, " - "filesystemtype = %zd, data = %zd\n", + DPRINTF("perfuse lengths: source = %"PRId32", target = %"PRId32", " + "filesystemtype = %"PRId32", data = %"PRId32"\n", pmo->pmo_source_len, pmo->pmo_target_len, pmo->pmo_filesystemtype_len, @@ -165,7 +165,7 @@ pmi->pmi_source = source; pmi->pmi_target = target; pmi->pmi_filesystemtype = filesystemtype; - pmi->pmi_mountflags = mountflags; + pmi->pmi_mountflags = (int)mountflags; pmi->pmi_data = data; return;