Libc-1353.11.2.tar.gz

[apple/libc.git] / gen / FreeBSD / getbsize.c

diff --git a/gen/FreeBSD/getbsize.c b/gen/FreeBSD/getbsize.c
index b922f1c77f1791e9808417e820ad2d7ac875e9e0..bbf5b1e89686776a7151c98259c7486bfb2d713e 100644 (file)
--- a/gen/FreeBSD/getbsize.c
+++ b/gen/FreeBSD/getbsize.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -35,7 +31,7 @@
 static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $");
+__FBSDID("$FreeBSD$");

 
 #include <err.h>
 #include <stdio.h>
 
 #include <err.h>
 #include <stdio.h>


@@ -43,9 +39,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien
 #include <string.h>
 
 char *
 #include <string.h>
 
 char *

-getbsize(headerlenp, blocksizep)
-       int *headerlenp;
-       long *blocksizep;
+getbsize(int *headerlenp, long *blocksizep)

 {
        static char header[20];
        long n, max, mul, blocksize;
 {
        static char header[20];
        long n, max, mul, blocksize;


@@ -87,6 +81,7 @@ getbsize(headerlenp, blocksizep)
                default:
 fmterr:                        warnx("%s: unknown blocksize", p);
                        n = 512;
                default:
 fmterr:                        warnx("%s: unknown blocksize", p);
                        n = 512;

+                       max = MAXB;

                        mul = 1;
                        break;
                }
                        mul = 1;
                        break;
                }