add the rest of the routines to libkern.h; use it in kernel source

SCCS-vsn: sys/libkern/libkern.h 7.2
SCCS-vsn: sys/libkern/locc.c 7.3
SCCS-vsn: sys/libkern/scanc.c 7.3
SCCS-vsn: sys/libkern/skpc.c 7.3

diff --git a/usr/src/sys/libkern/libkern.h b/usr/src/sys/libkern/libkern.h
index f682719..cd46905 100644 (file)
--- a/usr/src/sys/libkern/libkern.h
+++ b/usr/src/sys/libkern/libkern.h
@@ -4,17 +4,27 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)libkern.h   7.1 (Berkeley) %G%
+ *     @(#)libkern.h   7.2 (Berkeley) %G%

  */
 
  */
 

+#include <sys/types.h>
+

 /* Prototypes for non-quad routines. */
 
 int     bcmp __P((const void *, const void *, size_t));
 int     ffs __P((int));
 /* Prototypes for non-quad routines. */
 
 int     bcmp __P((const void *, const void *, size_t));
 int     ffs __P((int));

-int     locc __P((int mask, char *cp, unsigned size));
-int     scanc __P((unsigned size, u_char *cp, u_char *table, int mask));
-int     skpc __P((int mask, int size, char *cp));
+int     imax __P((int, int));
+int     imin __P((int, int));
+long    lmax __P((long, long));
+long    lmin __P((long, long));
+int     locc __P((int, char *, u_int));
+u_int   max __P((u_int, u_int));
+u_int   min __P((u_int, u_int));
+int     scanc __P((u_int, u_char *, u_char *, int));
+int     skpc __P((int, int, char *));

 char   *strcat __P((char *, const char *));
 char   *strcpy __P((char *, const char *));
 size_t  strlen __P((const char *));
 char   *strncpy __P((char *, const char *, size_t));
 char   *strcat __P((char *, const char *));
 char   *strcpy __P((char *, const char *));
 size_t  strlen __P((const char *));
 char   *strncpy __P((char *, const char *, size_t));

+u_long  ulmax __P((u_long, u_long));
+u_long  ulmin __P((u_long, u_long));

diff --git a/usr/src/sys/libkern/locc.c b/usr/src/sys/libkern/locc.c
index 1233b57..b5ff502 100644 (file)
--- a/usr/src/sys/libkern/locc.c
+++ b/usr/src/sys/libkern/locc.c
@@ -4,19 +4,21 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)locc.c      7.2 (Berkeley) %G%
+ *     @(#)locc.c      7.3 (Berkeley) %G%

  */
 
  */
 

+#include "libkern.h"
+

 int
 locc(mask0, cp0, size)
        int mask0;
        char *cp0;
 int
 locc(mask0, cp0, size)
        int mask0;
        char *cp0;

-       unsigned int size;
+       u_int size;

 {
 {

-       register unsigned char *cp, *end, mask;
+       register u_char *cp, *end, mask;

 
        mask = mask0;
 
        mask = mask0;

-       cp = (unsigned char *)cp0;
+       cp = (u_char *)cp0;

        for (end = &cp[size]; cp < end && *cp != mask; ++cp);
        return (end - cp);
 }
        for (end = &cp[size]; cp < end && *cp != mask; ++cp);
        return (end - cp);
 }

diff --git a/usr/src/sys/libkern/scanc.c b/usr/src/sys/libkern/scanc.c
index d782452..6b511a6 100644 (file)
--- a/usr/src/sys/libkern/scanc.c
+++ b/usr/src/sys/libkern/scanc.c
@@ -4,17 +4,19 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)scanc.c     7.2 (Berkeley) %G%
+ *     @(#)scanc.c     7.3 (Berkeley) %G%

  */
 
  */
 

+#include "libkern.h"
+

 int
 scanc(size, cp, table, mask0)
 int
 scanc(size, cp, table, mask0)

-       unsigned int size;
-       register unsigned char *cp, table[];
+       u_int size;
+       register u_char *cp, table[];

        int mask0;
 {
        int mask0;
 {

-       register unsigned char *end;
-       register unsigned char mask;
+       register u_char *end;
+       register u_char mask;

 
        mask = mask0;
        for (end = &cp[size]; cp < end && (table[*cp] & mask) == 0; ++cp);
 
        mask = mask0;
        for (end = &cp[size]; cp < end && (table[*cp] & mask) == 0; ++cp);

diff --git a/usr/src/sys/libkern/skpc.c b/usr/src/sys/libkern/skpc.c
index 8dc7863..822caf1 100644 (file)
--- a/usr/src/sys/libkern/skpc.c
+++ b/usr/src/sys/libkern/skpc.c
@@ -4,19 +4,21 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)skpc.c      7.2 (Berkeley) %G%
+ *     @(#)skpc.c      7.3 (Berkeley) %G%

  */
 
  */
 

+#include "libkern.h"
+

 int
 skpc(mask0, size, cp0)
        int mask0;
        int size;
        char *cp0;
 {
 int
 skpc(mask0, size, cp0)
        int mask0;
        int size;
        char *cp0;
 {

-       register unsigned char *cp, *end, mask;
+       register u_char *cp, *end, mask;

 
        mask = mask0;
 
        mask = mask0;

-       cp = (unsigned char *)cp0;
+       cp = (u_char *)cp0;

        for (end = &cp[size]; cp < end && *cp == mask; ++cp);
        return (end - cp);
 }
        for (end = &cp[size]; cp < end && *cp == mask; ++cp);
        return (end - cp);
 }