Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libpuffs Avoid using register_t or vsize_t in <puffs.h>



details:   https://anonhg.NetBSD.org/src/rev/2e5a13a92a8b
branches:  trunk
changeset: 1026617:2e5a13a92a8b
user:      pho <pho%NetBSD.org@localhost>
date:      Fri Dec 03 14:00:59 2021 +0000

description:
Avoid using register_t or vsize_t in <puffs.h>

<puffs.h> is a user-space header, and should not use any of
kernel-only types. It's not reasonable to require user-land
filesystems to #define _KERNTYPES.

diffstat:

 lib/libpuffs/puffs.3     |  4 ++--
 lib/libpuffs/puffs.c     |  6 +++---
 lib/libpuffs/puffs.h     |  8 ++++----
 lib/libpuffs/puffs_ops.3 |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r ab8b50febe9a -r 2e5a13a92a8b lib/libpuffs/puffs.3
--- a/lib/libpuffs/puffs.3      Fri Dec 03 13:27:37 2021 +0000
+++ b/lib/libpuffs/puffs.3      Fri Dec 03 14:00:59 2021 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: puffs.3,v 1.64 2019/12/27 10:13:59 msaitoh Exp $
+.\"    $NetBSD: puffs.3,v 1.65 2021/12/03 14:00:59 pho Exp $
 .\"
 .\" Copyright (c) 2006, 2007, 2008 Antti Kantee.  All rights reserved.
 .\"
@@ -55,7 +55,7 @@
 .Fn puffs_setroot "struct puffs_usermount *pu" "struct puffs_node *node"
 .Ft void
 .Fo puffs_setrootinfo
-.Fa "struct puffs_usermount *pu" "enum vtype vt" "vsize_t vsize" "dev_t rdev"
+.Fa "struct puffs_usermount *pu" "enum vtype vt" "voff_t vsize" "dev_t rdev"
 .Fc
 .Ft struct puffs_node *
 .Fn puffs_getroot "struct puffs_usermount *pu"
diff -r ab8b50febe9a -r 2e5a13a92a8b lib/libpuffs/puffs.c
--- a/lib/libpuffs/puffs.c      Fri Dec 03 13:27:37 2021 +0000
+++ b/lib/libpuffs/puffs.c      Fri Dec 03 14:00:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs.c,v 1.125 2021/10/30 10:34:18 nia Exp $  */
+/*     $NetBSD: puffs.c,v 1.126 2021/12/03 14:00:59 pho Exp $  */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.125 2021/10/30 10:34:18 nia Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.126 2021/12/03 14:00:59 pho Exp $");
 #endif /* !lint */
 
 #include <sys/param.h>
@@ -265,7 +265,7 @@
 
 void
 puffs_setrootinfo(struct puffs_usermount *pu, enum vtype vt,
-       vsize_t vsize, dev_t rdev)
+       voff_t vsize, dev_t rdev)
 {
        struct puffs_kargs *pargs = pu->pu_kargp;
 
diff -r ab8b50febe9a -r 2e5a13a92a8b lib/libpuffs/puffs.h
--- a/lib/libpuffs/puffs.h      Fri Dec 03 13:27:37 2021 +0000
+++ b/lib/libpuffs/puffs.h      Fri Dec 03 14:00:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs.h,v 1.128 2019/09/23 12:00:57 christos Exp $     */
+/*     $NetBSD: puffs.h,v 1.129 2021/12/03 14:00:59 pho Exp $  */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -223,7 +223,7 @@
        int (*puffs_node_inactive)(struct puffs_usermount *, puffs_cookie_t);
        int (*puffs_node_print)(struct puffs_usermount *, puffs_cookie_t);
        int (*puffs_node_pathconf)(struct puffs_usermount *,
-           puffs_cookie_t, int, register_t *);
+           puffs_cookie_t, int, __register_t *);
        int (*puffs_node_advlock)(struct puffs_usermount *,
            puffs_cookie_t, void *, int, struct flock *, int);
        int (*puffs_node_read)(struct puffs_usermount *, puffs_cookie_t,
@@ -385,7 +385,7 @@
        int fsname##_node_print(struct puffs_usermount *,               \
            puffs_cookie_t);                                            \
        int fsname##_node_pathconf(struct puffs_usermount *,            \
-           puffs_cookie_t, int, register_t *);                         \
+           puffs_cookie_t, int, __register_t *);                               \
        int fsname##_node_advlock(struct puffs_usermount *,             \
            puffs_cookie_t, void *, int, struct flock *, int);          \
        int fsname##_node_read(struct puffs_usermount *, puffs_cookie_t,\
@@ -503,7 +503,7 @@
                                      struct puffs_node *);
 struct puffs_node      *puffs_getroot(struct puffs_usermount *);
 void                   puffs_setrootinfo(struct puffs_usermount *,
-                                         enum vtype, vsize_t, dev_t); 
+                                         enum vtype, voff_t, dev_t); 
 
 void                   *puffs_getspecific(struct puffs_usermount *);
 void                   puffs_setspecific(struct puffs_usermount *, void *);
diff -r ab8b50febe9a -r 2e5a13a92a8b lib/libpuffs/puffs_ops.3
--- a/lib/libpuffs/puffs_ops.3  Fri Dec 03 13:27:37 2021 +0000
+++ b/lib/libpuffs/puffs_ops.3  Fri Dec 03 14:00:59 2021 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: puffs_ops.3,v 1.47 2021/08/04 09:31:25 andvar Exp $
+.\"    $NetBSD: puffs_ops.3,v 1.48 2021/12/03 14:00:59 pho Exp $
 .\"
 .\" Copyright (c) 2007 Antti Kantee.  All rights reserved.
 .\"
@@ -120,7 +120,7 @@
 .Ft int
 .Fo puffs_node_pathconf
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int name"
-.Fa "register_t *retval"
+.Fa "__register_t *retval"
 .Fc
 .Ft int
 .Fo puffs_node_advlock



Home | Main Index | Thread Index | Old Index