4 files changed, 18 insertions, 22 deletions

diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c
index 2373c170e7..73b7432731 100644
--- a/src/lib/libc/net/htonl.c
+++ b/src/lib/libc/net/htonl.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: htonl.c,v 1.3 1996/08/19 08:29:04 tholo Exp $";
+static char *rcsid = "$OpenBSD: htonl.c,v 1.4 1996/12/12 03:19:55 tholo Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -12,16 +12,14 @@ static char *rcsid = "$OpenBSD: htonl.c,v 1.3 1996/08/19 08:29:04 tholo Exp $";
 
 #undef htonl
 
-unsigned long
+u_int32_t
 htonl(x)
-        unsigned long x;
+        u_int32_t x;
 {
-        u_int32_t y = x;
-
 #if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *)&y;
+        u_char *s = (u_char *)&x;
         return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
 #else
-        return y;
+        return x;
 #endif
 }
diff --git a/src/lib/libc/net/htons.c b/src/lib/libc/net/htons.c
index f0554f2166..e647d8c91e 100644
--- a/src/lib/libc/net/htons.c
+++ b/src/lib/libc/net/htons.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: htons.c,v 1.4 1996/08/19 08:29:05 tholo Exp $";
+static char *rcsid = "$OpenBSD: htons.c,v 1.5 1996/12/12 03:19:55 tholo Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -12,12 +12,12 @@ static char *rcsid = "$OpenBSD: htons.c,v 1.4 1996/08/19 08:29:05 tholo Exp $";
 
 #undef htons
 
-unsigned short
+u_int16_t
 #if __STDC__
-htons(unsigned short x)
+htons(u_int16_t x)
 #else
 htons(x)
-        unsigned short x;
+        u_int16_t x;
 #endif
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/src/lib/libc/net/ntohl.c b/src/lib/libc/net/ntohl.c
index 0947a071ae..7d3e227e60 100644
--- a/src/lib/libc/net/ntohl.c
+++ b/src/lib/libc/net/ntohl.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ntohl.c,v 1.3 1996/08/19 08:29:33 tholo Exp $";
+static char *rcsid = "$OpenBSD: ntohl.c,v 1.4 1996/12/12 03:19:56 tholo Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -12,16 +12,14 @@ static char *rcsid = "$OpenBSD: ntohl.c,v 1.3 1996/08/19 08:29:33 tholo Exp $";
 
 #undef ntohl
 
-unsigned long
+u_int32_t
 ntohl(x)
-        unsigned long x;
+        u_int32_t x;
 {
-        u_int32_t y = x;
-
 #if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *)&y;
+        u_char *s = (u_char *)&x;
         return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
 #else
-        return y;
+        return x;
 #endif
 }
diff --git a/src/lib/libc/net/ntohs.c b/src/lib/libc/net/ntohs.c
index f717039803..129729aa32 100644
--- a/src/lib/libc/net/ntohs.c
+++ b/src/lib/libc/net/ntohs.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ntohs.c,v 1.4 1996/08/19 08:29:35 tholo Exp $";
+static char *rcsid = "$OpenBSD: ntohs.c,v 1.5 1996/12/12 03:19:56 tholo Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -12,12 +12,12 @@ static char *rcsid = "$OpenBSD: ntohs.c,v 1.4 1996/08/19 08:29:35 tholo Exp $";
 
 #undef ntohs
 
-unsigned short
+u_int16_t
 #if __STDC__
-ntohs(unsigned short x)
+ntohs(u_int16_t x)
 #else
 ntohs(x)
-        unsigned short x;
+        u_int16_t x;
 #endif
 {
 #if BYTE_ORDER == LITTLE_ENDIAN