[src/trunk]: src More LP64 fixes

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a8daac0f497
branches:  trunk
changeset: 757565:6a8daac0f497
user:      manu <manu%NetBSD.org@localhost>
date:      Mon Sep 06 01:40:24 2010 +0000

description:
More LP64 fixes

diffstat:

 lib/libperfuse/ops.c          |   2 +-
 lib/libperfuse/perfuse.c      |  20 ++++++++++----------
 lib/libperfuse/perfuse_if.h   |  14 +++++++-------
 lib/libperfuse/perfuse_priv.h |   2 +-
 usr.sbin/perfused/msg.c       |   6 +++---
 usr.sbin/perfused/perfused.c  |   8 ++++----
 6 files changed, 26 insertions(+), 26 deletions(-)

diffs (144 lines):

diff -r 945f44390d06 -r 6a8daac0f497 lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Mon Sep 06 01:17:05 2010 +0000
+++ b/lib/libperfuse/ops.c      Mon Sep 06 01:40:24 2010 +0000
@@ -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.
diff -r 945f44390d06 -r 6a8daac0f497 lib/libperfuse/perfuse.c
--- a/lib/libperfuse/perfuse.c  Mon Sep 06 01:17:05 2010 +0000
+++ b/lib/libperfuse/perfuse.c  Mon Sep 06 01:40:24 2010 +0000
@@ -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)) {
diff -r 945f44390d06 -r 6a8daac0f497 lib/libperfuse/perfuse_if.h
--- a/lib/libperfuse/perfuse_if.h       Mon Sep 06 01:17:05 2010 +0000
+++ b/lib/libperfuse/perfuse_if.h       Mon Sep 06 01:40:24 2010 +0000
@@ -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 {
diff -r 945f44390d06 -r 6a8daac0f497 lib/libperfuse/perfuse_priv.h
--- a/lib/libperfuse/perfuse_priv.h     Mon Sep 06 01:17:05 2010 +0000
+++ b/lib/libperfuse/perfuse_priv.h     Mon Sep 06 01:40:24 2010 +0000
@@ -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.
diff -r 945f44390d06 -r 6a8daac0f497 usr.sbin/perfused/msg.c
--- a/usr.sbin/perfused/msg.c   Mon Sep 06 01:17:05 2010 +0000
+++ b/usr.sbin/perfused/msg.c   Mon Sep 06 01:40:24 2010 +0000
@@ -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); 
 
diff -r 945f44390d06 -r 6a8daac0f497 usr.sbin/perfused/perfused.c
--- a/usr.sbin/perfused/perfused.c      Mon Sep 06 01:17:05 2010 +0000
+++ b/usr.sbin/perfused/perfused.c      Mon Sep 06 01:40:24 2010 +0000
@@ -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;