get the types right, and get the parameters to locc in the right order!

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

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

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

  */
 
 int
  */
 
 int

-locc(mask, size, cp)
-       register unsigned char mask;
+locc(mask0, cp0, size)
+       int mask0;
+       char *cp0;

        unsigned int size;
        unsigned int size;

-       register unsigned char *cp;

 {
 {

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

 
 

+       mask = mask0;
+       cp = (unsigned 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 cbebd6e..d782452 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.1 (Berkeley) %G%
+ *     @(#)scanc.c     7.2 (Berkeley) %G%

  */
 
 int
  */
 
 int

-scanc(size, cp, table, mask)
+scanc(size, cp, table, mask0)

        unsigned int size;
        register unsigned char *cp, table[];
        unsigned int size;
        register unsigned char *cp, table[];

-       register unsigned char mask;
+       int mask0;

 {
        register unsigned char *end;
 {
        register unsigned char *end;

+       register unsigned char mask;

 
 

+       mask = mask0;

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

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

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

  */
 
 int
  */
 
 int

-skpc(mask, size, cp)
-       register unsigned char mask;
-       unsigned int size;
-       register unsigned char *cp;
+skpc(mask0, size, cp0)
+       int mask0;
+       int size;
+       char *cp0;

 {
 {

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

 
 

+       mask = mask0;
+       cp = (unsigned 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);
 }