summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1995-01-06 00:10:05 +0000
committercgd <cgd@NetBSD.org>1995-01-06 00:10:05 +0000
commit50c2ab0cd05fcabc2dad7d55a1feeb7db9151f53 (patch)
treeae08b4a76b5d4f5e7c5f616e62e405140559a8ae /sys/lib
parent1502c60de3cbeb9979d2339fe5fb2aa80ea178e9 (diff)
from libc
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libkern/adddi3.c8
-rw-r--r--sys/lib/libkern/anddi3.c8
-rw-r--r--sys/lib/libkern/ashldi3.c8
-rw-r--r--sys/lib/libkern/ashrdi3.c8
-rw-r--r--sys/lib/libkern/bcmp.c8
-rw-r--r--sys/lib/libkern/bzero.c8
-rw-r--r--sys/lib/libkern/cmpdi2.c8
-rw-r--r--sys/lib/libkern/divdi3.c8
-rw-r--r--sys/lib/libkern/ffs.c8
-rw-r--r--sys/lib/libkern/htonl.c15
-rw-r--r--sys/lib/libkern/htons.c11
-rw-r--r--sys/lib/libkern/iordi3.c8
-rw-r--r--sys/lib/libkern/lshldi3.c8
-rw-r--r--sys/lib/libkern/lshrdi3.c8
-rw-r--r--sys/lib/libkern/moddi3.c8
-rw-r--r--sys/lib/libkern/muldi3.c8
-rw-r--r--sys/lib/libkern/negdi2.c8
-rw-r--r--sys/lib/libkern/notdi2.c8
-rw-r--r--sys/lib/libkern/ntohl.c15
-rw-r--r--sys/lib/libkern/ntohs.c11
-rw-r--r--sys/lib/libkern/strcat.c8
-rw-r--r--sys/lib/libkern/strcmp.c8
-rw-r--r--sys/lib/libkern/strcpy.c8
-rw-r--r--sys/lib/libkern/strlen.c8
-rw-r--r--sys/lib/libkern/strncmp.c8
-rw-r--r--sys/lib/libkern/strncpy.c8
-rw-r--r--sys/lib/libkern/subdi3.c8
-rw-r--r--sys/lib/libkern/ucmpdi2.c8
-rw-r--r--sys/lib/libkern/udivdi3.c8
-rw-r--r--sys/lib/libkern/umoddi3.c8
-rw-r--r--sys/lib/libkern/xordi3.c8
31 files changed, 84 insertions, 184 deletions
diff --git a/sys/lib/libkern/adddi3.c b/sys/lib/libkern/adddi3.c
index 23422fcc00d..09e89565465 100644
--- a/sys/lib/libkern/adddi3.c
+++ b/sys/lib/libkern/adddi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: adddi3.c,v 1.2 1994/10/26 06:42:14 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)adddi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: adddi3.c,v 1.2 1994/10/26 06:42:14 cgd Exp $";
+/*static char *sccsid = "from: @(#)adddi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: adddi3.c,v 1.3 1995/01/06 00:11:04 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/anddi3.c b/sys/lib/libkern/anddi3.c
index ccfca9886e6..2fd565cb1ba 100644
--- a/sys/lib/libkern/anddi3.c
+++ b/sys/lib/libkern/anddi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: anddi3.c,v 1.2 1994/10/26 06:42:15 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)anddi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: anddi3.c,v 1.2 1994/10/26 06:42:15 cgd Exp $";
+/*static char *sccsid = "from: @(#)anddi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: anddi3.c,v 1.3 1995/01/06 00:11:08 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/ashldi3.c b/sys/lib/libkern/ashldi3.c
index d4b366234b7..9db2ef03746 100644
--- a/sys/lib/libkern/ashldi3.c
+++ b/sys/lib/libkern/ashldi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ashldi3.c,v 1.2 1994/10/26 06:42:16 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)ashldi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: ashldi3.c,v 1.2 1994/10/26 06:42:16 cgd Exp $";
+/*static char *sccsid = "from: @(#)ashldi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: ashldi3.c,v 1.3 1995/01/06 00:11:09 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/ashrdi3.c b/sys/lib/libkern/ashrdi3.c
index a71e2931a17..f5a1e4f3362 100644
--- a/sys/lib/libkern/ashrdi3.c
+++ b/sys/lib/libkern/ashrdi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ashrdi3.c,v 1.2 1994/10/26 06:42:17 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)ashrdi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: ashrdi3.c,v 1.2 1994/10/26 06:42:17 cgd Exp $";
+/*static char *sccsid = "from: @(#)ashrdi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: ashrdi3.c,v 1.3 1995/01/06 00:11:10 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/bcmp.c b/sys/lib/libkern/bcmp.c
index 0718844e11d..3235ac166fb 100644
--- a/sys/lib/libkern/bcmp.c
+++ b/sys/lib/libkern/bcmp.c
@@ -1,5 +1,3 @@
-/* $NetBSD: bcmp.c,v 1.2 1994/10/26 06:42:18 cgd Exp $ */
-
/*
* Copyright (c) 1987 Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)bcmp.c 5.6 (Berkeley) 2/24/91";
-#endif
-static char *rcsid = "$NetBSD: bcmp.c,v 1.2 1994/10/26 06:42:18 cgd Exp $";
+/*static char *sccsid = "from: @(#)bcmp.c 5.6 (Berkeley) 2/24/91";*/
+static char *rcsid = "$Id: bcmp.c,v 1.3 1995/01/06 00:18:10 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <string.h>
diff --git a/sys/lib/libkern/bzero.c b/sys/lib/libkern/bzero.c
index e85f096cdc0..3150742a16a 100644
--- a/sys/lib/libkern/bzero.c
+++ b/sys/lib/libkern/bzero.c
@@ -1,5 +1,3 @@
-/* $NetBSD: bzero.c,v 1.2 1994/10/26 06:42:19 cgd Exp $ */
-
/*
* Copyright (c) 1987 Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)bzero.c 5.7 (Berkeley) 2/24/91";
-#endif
-static char *rcsid = "$NetBSD: bzero.c,v 1.2 1994/10/26 06:42:19 cgd Exp $";
+/*static char *sccsid = "from: @(#)bzero.c 5.7 (Berkeley) 2/24/91";*/
+static char *rcsid = "$Id: bzero.c,v 1.3 1995/01/06 00:18:15 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <string.h>
diff --git a/sys/lib/libkern/cmpdi2.c b/sys/lib/libkern/cmpdi2.c
index 8e99d4b77b1..81d6ca27617 100644
--- a/sys/lib/libkern/cmpdi2.c
+++ b/sys/lib/libkern/cmpdi2.c
@@ -1,5 +1,3 @@
-/* $NetBSD: cmpdi2.c,v 1.2 1994/10/26 06:42:19 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)cmpdi2.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: cmpdi2.c,v 1.2 1994/10/26 06:42:19 cgd Exp $";
+/*static char *sccsid = "from: @(#)cmpdi2.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: cmpdi2.c,v 1.3 1995/01/06 00:12:18 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/divdi3.c b/sys/lib/libkern/divdi3.c
index 5a8b17e222c..2a66df2ab8a 100644
--- a/sys/lib/libkern/divdi3.c
+++ b/sys/lib/libkern/divdi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: divdi3.c,v 1.2 1994/10/26 06:42:20 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)divdi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: divdi3.c,v 1.2 1994/10/26 06:42:20 cgd Exp $";
+/*static char *sccsid = "from: @(#)divdi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: divdi3.c,v 1.3 1995/01/06 00:11:12 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/ffs.c b/sys/lib/libkern/ffs.c
index deabcbbf5fd..71a412f15fc 100644
--- a/sys/lib/libkern/ffs.c
+++ b/sys/lib/libkern/ffs.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ffs.c,v 1.2 1994/10/26 06:42:21 cgd Exp $ */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)ffs.c 5.4 (Berkeley) 5/17/90";
-#endif
-static char *rcsid = "$NetBSD: ffs.c,v 1.2 1994/10/26 06:42:21 cgd Exp $";
+/*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/
+static char *rcsid = "$Id: ffs.c,v 1.3 1995/01/06 00:18:16 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <string.h>
diff --git a/sys/lib/libkern/htonl.c b/sys/lib/libkern/htonl.c
index ad287b7b102..47f7b88c1dd 100644
--- a/sys/lib/libkern/htonl.c
+++ b/sys/lib/libkern/htonl.c
@@ -1,5 +1,3 @@
-/* $NetBSD: htonl.c,v 1.3 1994/10/26 06:42:22 cgd Exp $ */
-
/*
* Copyright (c) 1993 Winning Strategies, Inc.
* All rights reserved.
@@ -28,24 +26,29 @@
* 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.
+ *
+ * $Id: htonl.c,v 1.4 1995/01/06 00:10:05 cgd Exp $
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: htonl.c,v 1.3 1994/10/26 06:42:22 cgd Exp $";
+static char *rcsid = "$Id: htonl.c,v 1.4 1995/01/06 00:10:05 cgd Exp $";
#endif
+#include <sys/types.h>
#include <machine/endian.h>
#undef htonl
unsigned long
-htonl (x)
+htonl(x)
unsigned long x;
{
+ u_int32_t y = x;
+
#if BYTE_ORDER == LITTLE_ENDIAN
- char *s = (char *) &x;
+ u_char *s = (u_char *)&y;
return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3];
#else
- return x;
+ return y;
#endif
}
diff --git a/sys/lib/libkern/htons.c b/sys/lib/libkern/htons.c
index dbd6f95817a..f8a38d72a85 100644
--- a/sys/lib/libkern/htons.c
+++ b/sys/lib/libkern/htons.c
@@ -1,5 +1,3 @@
-/* $NetBSD: htons.c,v 1.3 1994/10/26 06:42:23 cgd Exp $ */
-
/*
* Copyright (c) 1993 Winning Strategies, Inc.
* All rights reserved.
@@ -28,22 +26,25 @@
* 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.
+ *
+ * $Id: htons.c,v 1.4 1995/01/06 00:10:06 cgd Exp $
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: htons.c,v 1.3 1994/10/26 06:42:23 cgd Exp $";
+static char *rcsid = "$Id: htons.c,v 1.4 1995/01/06 00:10:06 cgd Exp $";
#endif
+#include <sys/types.h>
#include <machine/endian.h>
#undef htons
unsigned short
-htons (x)
+htons(x)
unsigned short x;
{
#if BYTE_ORDER == LITTLE_ENDIAN
- char *s = (char *) &x;
+ u_char *s = (u_char *) &x;
return s[0] << 8 | s[1];
#else
return x;
diff --git a/sys/lib/libkern/iordi3.c b/sys/lib/libkern/iordi3.c
index e23cafe5a74..4d472e5e507 100644
--- a/sys/lib/libkern/iordi3.c
+++ b/sys/lib/libkern/iordi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: iordi3.c,v 1.2 1994/10/26 06:42:25 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)iordi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: iordi3.c,v 1.2 1994/10/26 06:42:25 cgd Exp $";
+/*static char *sccsid = "from: @(#)iordi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: iordi3.c,v 1.3 1995/01/06 00:11:13 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/lshldi3.c b/sys/lib/libkern/lshldi3.c
index 2ca36300ff8..51c52038b57 100644
--- a/sys/lib/libkern/lshldi3.c
+++ b/sys/lib/libkern/lshldi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: lshldi3.c,v 1.2 1994/10/26 06:42:30 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)lshldi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: lshldi3.c,v 1.2 1994/10/26 06:42:30 cgd Exp $";
+/*static char *sccsid = "from: @(#)lshldi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: lshldi3.c,v 1.3 1995/01/06 00:11:14 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/lshrdi3.c b/sys/lib/libkern/lshrdi3.c
index 70cdfa95b3e..d8a8a3c1ff8 100644
--- a/sys/lib/libkern/lshrdi3.c
+++ b/sys/lib/libkern/lshrdi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: lshrdi3.c,v 1.2 1994/10/26 06:42:31 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)lshrdi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: lshrdi3.c,v 1.2 1994/10/26 06:42:31 cgd Exp $";
+/*static char *sccsid = "from: @(#)lshrdi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: lshrdi3.c,v 1.3 1995/01/06 00:11:17 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/moddi3.c b/sys/lib/libkern/moddi3.c
index 29b3d8b150f..4f10e87b5eb 100644
--- a/sys/lib/libkern/moddi3.c
+++ b/sys/lib/libkern/moddi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: moddi3.c,v 1.2 1994/10/26 06:42:34 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)moddi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: moddi3.c,v 1.2 1994/10/26 06:42:34 cgd Exp $";
+/*static char *sccsid = "from: @(#)moddi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: moddi3.c,v 1.3 1995/01/06 00:11:18 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/muldi3.c b/sys/lib/libkern/muldi3.c
index a6f456ec27c..8e3b19b2931 100644
--- a/sys/lib/libkern/muldi3.c
+++ b/sys/lib/libkern/muldi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: muldi3.c,v 1.2 1994/10/26 06:42:35 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)muldi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: muldi3.c,v 1.2 1994/10/26 06:42:35 cgd Exp $";
+/*static char *sccsid = "from: @(#)muldi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: muldi3.c,v 1.3 1995/01/06 00:11:19 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/negdi2.c b/sys/lib/libkern/negdi2.c
index 133abbe19ac..18b733aa0e0 100644
--- a/sys/lib/libkern/negdi2.c
+++ b/sys/lib/libkern/negdi2.c
@@ -1,5 +1,3 @@
-/* $NetBSD: negdi2.c,v 1.2 1994/10/26 06:42:36 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)negdi2.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: negdi2.c,v 1.2 1994/10/26 06:42:36 cgd Exp $";
+/*static char *sccsid = "from: @(#)negdi2.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: negdi2.c,v 1.3 1995/01/06 00:12:21 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/notdi2.c b/sys/lib/libkern/notdi2.c
index 014a1bc30c5..99bb8eb1448 100644
--- a/sys/lib/libkern/notdi2.c
+++ b/sys/lib/libkern/notdi2.c
@@ -1,5 +1,3 @@
-/* $NetBSD: notdi2.c,v 1.2 1994/10/26 06:42:37 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)notdi2.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: notdi2.c,v 1.2 1994/10/26 06:42:37 cgd Exp $";
+/*static char *sccsid = "from: @(#)notdi2.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: notdi2.c,v 1.3 1995/01/06 00:12:21 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/ntohl.c b/sys/lib/libkern/ntohl.c
index 27f3ac4315e..a51b0f95fe2 100644
--- a/sys/lib/libkern/ntohl.c
+++ b/sys/lib/libkern/ntohl.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ntohl.c,v 1.3 1994/10/26 06:42:38 cgd Exp $ */
-
/*
* Copyright (c) 1993 Winning Strategies, Inc.
* All rights reserved.
@@ -28,24 +26,29 @@
* 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.
+ *
+ * $Id: ntohl.c,v 1.4 1995/01/06 00:10:08 cgd Exp $
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: ntohl.c,v 1.3 1994/10/26 06:42:38 cgd Exp $";
+static char *rcsid = "$Id: ntohl.c,v 1.4 1995/01/06 00:10:08 cgd Exp $";
#endif
+#include <sys/types.h>
#include <machine/endian.h>
#undef ntohl
unsigned long
-ntohl (x)
+ntohl(x)
unsigned long x;
{
+ u_int32_t y = x;
+
#if BYTE_ORDER == LITTLE_ENDIAN
- char *s = (char *) &x;
+ u_char *s = (u_char *)&y;
return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3];
#else
- return x;
+ return y;
#endif
}
diff --git a/sys/lib/libkern/ntohs.c b/sys/lib/libkern/ntohs.c
index 3ff6e3a6751..211232fef28 100644
--- a/sys/lib/libkern/ntohs.c
+++ b/sys/lib/libkern/ntohs.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ntohs.c,v 1.2 1994/10/26 06:42:39 cgd Exp $ */
-
/*
* Copyright (c) 1993 Winning Strategies, Inc.
* All rights reserved.
@@ -28,22 +26,25 @@
* 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.
+ *
+ * $Id: ntohs.c,v 1.3 1995/01/06 00:10:09 cgd Exp $
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: ntohs.c,v 1.2 1994/10/26 06:42:39 cgd Exp $";
+static char *rcsid = "$Id: ntohs.c,v 1.3 1995/01/06 00:10:09 cgd Exp $";
#endif
+#include <sys/types.h>
#include <machine/endian.h>
#undef ntohs
unsigned short
-ntohs (x)
+ntohs(x)
unsigned short x;
{
#if BYTE_ORDER == LITTLE_ENDIAN
- char *s = (char *) &x;
+ u_char *s = (u_char *) &x;
return s[0] << 8 | s[1];
#else
return x;
diff --git a/sys/lib/libkern/strcat.c b/sys/lib/libkern/strcat.c
index 2238a4711ac..03e57ea2df1 100644
--- a/sys/lib/libkern/strcat.c
+++ b/sys/lib/libkern/strcat.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strcat.c,v 1.2 1994/10/26 06:42:44 cgd Exp $ */
-
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strcat.c 5.6 (Berkeley) 2/24/91";
-#endif
-static char *rcsid = "$NetBSD: strcat.c,v 1.2 1994/10/26 06:42:44 cgd Exp $";
+/*static char *sccsid = "from: @(#)strcat.c 5.6 (Berkeley) 2/24/91";*/
+static char *rcsid = "$Id: strcat.c,v 1.3 1995/01/06 00:16:50 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <string.h>
diff --git a/sys/lib/libkern/strcmp.c b/sys/lib/libkern/strcmp.c
index 15a3b07a865..536f6db5531 100644
--- a/sys/lib/libkern/strcmp.c
+++ b/sys/lib/libkern/strcmp.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strcmp.c,v 1.2 1994/10/26 06:42:45 cgd Exp $ */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -37,10 +35,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strcmp.c 5.5 (Berkeley) 1/26/91";
-#endif
-static char *rcsid = "$NetBSD: strcmp.c,v 1.2 1994/10/26 06:42:45 cgd Exp $";
+/*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/
+static char *rcsid = "$Id: strcmp.c,v 1.3 1995/01/06 00:16:53 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/lib/libkern/strcpy.c b/sys/lib/libkern/strcpy.c
index 60b3a5a0288..a24a09d153b 100644
--- a/sys/lib/libkern/strcpy.c
+++ b/sys/lib/libkern/strcpy.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strcpy.c,v 1.2 1994/10/26 06:42:46 cgd Exp $ */
-
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strcpy.c 5.7 (Berkeley) 2/24/91";
-#endif
-static char *rcsid = "$NetBSD: strcpy.c,v 1.2 1994/10/26 06:42:46 cgd Exp $";
+/*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/
+static char *rcsid = "$Id: strcpy.c,v 1.3 1995/01/06 00:16:54 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/lib/libkern/strlen.c b/sys/lib/libkern/strlen.c
index 76d40688747..591a3cfb7fa 100644
--- a/sys/lib/libkern/strlen.c
+++ b/sys/lib/libkern/strlen.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strlen.c,v 1.2 1994/10/26 06:42:47 cgd Exp $ */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strlen.c 5.5 (Berkeley) 1/26/91";
-#endif
-static char *rcsid = "$NetBSD: strlen.c,v 1.2 1994/10/26 06:42:47 cgd Exp $";
+/*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/
+static char *rcsid = "$Id: strlen.c,v 1.3 1995/01/06 00:16:55 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/lib/libkern/strncmp.c b/sys/lib/libkern/strncmp.c
index 081e6b7888d..3900dd8a16f 100644
--- a/sys/lib/libkern/strncmp.c
+++ b/sys/lib/libkern/strncmp.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strncmp.c,v 1.2 1994/10/26 06:42:48 cgd Exp $ */
-
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -34,10 +32,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strncmp.c 5.6 (Berkeley) 1/26/91";
-#endif
-static char *rcsid = "$NetBSD: strncmp.c,v 1.2 1994/10/26 06:42:48 cgd Exp $";
+/*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/
+static char *rcsid = "$Id: strncmp.c,v 1.3 1995/01/06 00:16:56 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/lib/libkern/strncpy.c b/sys/lib/libkern/strncpy.c
index 0e4dedc36f6..481a33cb074 100644
--- a/sys/lib/libkern/strncpy.c
+++ b/sys/lib/libkern/strncpy.c
@@ -1,5 +1,3 @@
-/* $NetBSD: strncpy.c,v 1.2 1994/10/26 06:42:49 cgd Exp $ */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -37,10 +35,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strncpy.c 5.6 (Berkeley) 1/26/91";
-#endif
-static char *rcsid = "$NetBSD: strncpy.c,v 1.2 1994/10/26 06:42:49 cgd Exp $";
+/*static char *sccsid = "from: @(#)strncpy.c 5.6 (Berkeley) 1/26/91";*/
+static char *rcsid = "$Id: strncpy.c,v 1.3 1995/01/06 00:16:57 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/lib/libkern/subdi3.c b/sys/lib/libkern/subdi3.c
index 7a68814eed0..5d1dc009b9b 100644
--- a/sys/lib/libkern/subdi3.c
+++ b/sys/lib/libkern/subdi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: subdi3.c,v 1.2 1994/10/26 06:42:49 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)subdi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: subdi3.c,v 1.2 1994/10/26 06:42:49 cgd Exp $";
+/*static char *sccsid = "from: @(#)subdi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: subdi3.c,v 1.3 1995/01/06 00:11:20 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/ucmpdi2.c b/sys/lib/libkern/ucmpdi2.c
index b6e5216d333..8556dd2dc3f 100644
--- a/sys/lib/libkern/ucmpdi2.c
+++ b/sys/lib/libkern/ucmpdi2.c
@@ -1,5 +1,3 @@
-/* $NetBSD: ucmpdi2.c,v 1.2 1994/10/26 06:42:50 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)ucmpdi2.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: ucmpdi2.c,v 1.2 1994/10/26 06:42:50 cgd Exp $";
+/*static char *sccsid = "from: @(#)ucmpdi2.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: ucmpdi2.c,v 1.3 1995/01/06 00:12:22 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/udivdi3.c b/sys/lib/libkern/udivdi3.c
index 36d02739cf5..b9acecd2e2c 100644
--- a/sys/lib/libkern/udivdi3.c
+++ b/sys/lib/libkern/udivdi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: udivdi3.c,v 1.2 1994/10/26 06:42:51 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)udivdi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: udivdi3.c,v 1.2 1994/10/26 06:42:51 cgd Exp $";
+/*static char *sccsid = "from: @(#)udivdi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: udivdi3.c,v 1.3 1995/01/06 00:11:21 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/umoddi3.c b/sys/lib/libkern/umoddi3.c
index ccec6b01dc0..87ad0c2f722 100644
--- a/sys/lib/libkern/umoddi3.c
+++ b/sys/lib/libkern/umoddi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: umoddi3.c,v 1.2 1994/10/26 06:42:54 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)umoddi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: umoddi3.c,v 1.2 1994/10/26 06:42:54 cgd Exp $";
+/*static char *sccsid = "from: @(#)umoddi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: umoddi3.c,v 1.3 1995/01/06 00:11:22 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"
diff --git a/sys/lib/libkern/xordi3.c b/sys/lib/libkern/xordi3.c
index 64365595c4f..b489277520c 100644
--- a/sys/lib/libkern/xordi3.c
+++ b/sys/lib/libkern/xordi3.c
@@ -1,5 +1,3 @@
-/* $NetBSD: xordi3.c,v 1.2 1994/10/26 06:42:54 cgd Exp $ */
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,10 +36,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)xordi3.c 8.1 (Berkeley) 6/4/93";
-#endif
-static char *rcsid = "$NetBSD: xordi3.c,v 1.2 1994/10/26 06:42:54 cgd Exp $";
+/*static char *sccsid = "from: @(#)xordi3.c 8.1 (Berkeley) 6/4/93";*/
+static char *rcsid = "$Id: xordi3.c,v 1.3 1995/01/06 00:11:23 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
#include "quad.h"