aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2012-01-01 20:54:44 +0000
committerEd Schouten <ed@FreeBSD.org>2012-01-01 20:54:44 +0000
commit41adcfa1d0bfdc6ccbcbf069b059f7df461d3d32 (patch)
treeb7aa52109ebd06bfa9d512654cc49b723608b9ce
parent820491f824cff81e7b34447b88a72355708f5002 (diff)
Notes
-rw-r--r--sys/conf/files1
-rw-r--r--sys/libkern/skpc.c49
-rw-r--r--sys/sys/libkern.h1
-rw-r--r--sys/sys/param.h2
4 files changed, 1 insertions, 52 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 871921c61a78d..27255a82b0ce1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2564,7 +2564,6 @@ libkern/qsort_r.c standard
libkern/random.c standard
libkern/rindex.c standard
libkern/scanc.c standard
-libkern/skpc.c standard
libkern/strcasecmp.c standard
libkern/strcat.c standard
libkern/strcmp.c standard
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
deleted file mode 100644
index 9f4124bde2602..0000000000000
--- a/sys/libkern/skpc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)skpc.c 8.1 (Berkeley) 6/10/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/libkern.h>
-
-int
-skpc(mask0, size, cp0)
- int mask0;
- int size;
- char *cp0;
-{
- register u_char *cp, *end, mask;
-
- mask = mask0;
- cp = (u_char *)cp0;
- for (end = &cp[size]; cp < end && *cp == mask; ++cp);
- return (end - cp);
-}
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 0e525de6c6648..bbe3cfc7d9b36 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -102,7 +102,6 @@ u_long random(void);
char *index(const char *, int);
char *rindex(const char *, int);
int scanc(u_int, const u_char *, const u_char *, int);
-int skpc(int, int, char *);
void srandom(u_long);
int strcasecmp(const char *, const char *);
char *strcat(char * __restrict, const char * __restrict);
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 5e9b4e5cd907b..96292ccdfd690 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000003 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000004 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,