[src/netbsd-3]: src/lib/libc Pull up following revision(s) (requested by droc...

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

details:   https://anonhg.NetBSD.org/src/rev/d6c05af3636e
branches:  netbsd-3
changeset: 577866:d6c05af3636e
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Mar 01 17:12:51 2006 +0000

description:
Pull up following revision(s) (requested by drochner in ticket #1187):
        lib/libc/sys/statfs.c: revision 1.4
        lib/libc/gen/getmntinfo.c: revision 1.15
getmntinfo() if a compatibility function, so there is no point in hiding
references to the compatibility getfsstat()
The real problem behind PR lib/29919 was a stale weak_alias, so back out
the workaround.

diffstat:

 lib/libc/gen/getmntinfo.c |  12 +++++-------
 lib/libc/sys/statfs.c     |  12 ++----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diffs (86 lines):

diff -r 9e1e0fe0fe0b -r d6c05af3636e lib/libc/gen/getmntinfo.c
--- a/lib/libc/gen/getmntinfo.c Wed Mar 01 17:12:05 2006 +0000
+++ b/lib/libc/gen/getmntinfo.c Wed Mar 01 17:12:51 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getmntinfo.c,v 1.13.2.1 2005/04/08 13:38:11 tron Exp $ */
+/*     $NetBSD: getmntinfo.c,v 1.13.2.2 2006/03/01 17:12:51 riz Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getmntinfo.c       8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: getmntinfo.c,v 1.13.2.1 2005/04/08 13:38:11 tron Exp $");
+__RCSID("$NetBSD: getmntinfo.c,v 1.13.2.2 2006/03/01 17:12:51 riz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,8 +53,6 @@
 __weak_alias(getmntinfo,_getmntinfo)
 #endif
 
-int _getfsstat(struct statfs12 *, long, int);
-
 /*
  * Return information about mounted filesystems.
  */
@@ -70,10 +68,10 @@
        _DIAGASSERT(mntbufp != NULL);
 
        if (mntsize <= 0 &&
-           (mntsize = _getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
+           (mntsize = getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
                return (0);
        if (bufsize > 0 &&
-           (mntsize = _getfsstat(mntbuf, (long)bufsize, flags)) == -1)
+           (mntsize = getfsstat(mntbuf, (long)bufsize, flags)) == -1)
                return (0);
        while (bufsize <= mntsize * sizeof(struct statfs12)) {
                if (mntbuf)
@@ -81,7 +79,7 @@
                bufsize = (mntsize + 1) * sizeof(struct statfs12);
                if ((mntbuf = malloc(bufsize)) == NULL)
                        return (0);
-               if ((mntsize = _getfsstat(mntbuf, (long)bufsize, flags)) == -1)
+               if ((mntsize = getfsstat(mntbuf, (long)bufsize, flags)) == -1)
                        return (0);
        }
        *mntbufp = mntbuf;
diff -r 9e1e0fe0fe0b -r d6c05af3636e lib/libc/sys/statfs.c
--- a/lib/libc/sys/statfs.c     Wed Mar 01 17:12:05 2006 +0000
+++ b/lib/libc/sys/statfs.c     Wed Mar 01 17:12:51 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: statfs.c,v 1.2.2.1 2005/04/08 13:38:06 tron Exp $      */
+/*     $NetBSD: statfs.c,v 1.2.2.2 2006/03/01 17:12:51 riz Exp $       */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -56,8 +56,6 @@
 __warn_references(getfsstat,
     "warning: reference to obsolete getfsstat(); use getvfsstat()")
 
-int _getfsstat(struct statfs12 *, long, int);
-
 /*
  * Convert from a new statvfs to an old statfs structure.
  */
@@ -162,7 +160,7 @@
 }
 
 int
-_getfsstat(struct statfs12 *ost, long size, int flags)
+getfsstat(struct statfs12 *ost, long size, int flags)
 {
        struct statvfs *nst;
        int ret, i;
@@ -184,9 +182,3 @@
                free(nst);
        return ret;
 }
-
-int
-getfsstat(struct statfs12 *ost, long size, int flags)
-{
-       return _getfsstat(ost, size, flags);
-}