summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libc/net/ns_addr.c7
-rw-r--r--src/lib/libc/net/ns_ntoa.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libc/net/ns_addr.c b/src/lib/libc/net/ns_addr.c
index 9a4483a209..8f2e4bc513 100644
--- a/src/lib/libc/net/ns_addr.c
+++ b/src/lib/libc/net/ns_addr.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#if defined(LIBC_SCCS) && !defined(lint) 37#if defined(LIBC_SCCS) && !defined(lint)
38static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.3 1997/07/09 01:08:41 millert Exp $"; 38static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.4 1997/07/21 20:31:05 deraadt Exp $";
39#endif /* LIBC_SCCS and not lint */ 39#endif /* LIBC_SCCS and not lint */
40 40
41#include <sys/param.h> 41#include <sys/param.h>
@@ -45,7 +45,8 @@ static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.3 1997/07/09 01:08:41 millert Exp
45 45
46static struct ns_addr addr, zero_addr; 46static struct ns_addr addr, zero_addr;
47 47
48static void Field(), cvtbase(); 48static void Field __P((char *, u_int8_t *, int));
49static void cvtbase __P((long, int, int[], int, u_int8_t[], int));
49 50
50struct ns_addr 51struct ns_addr
51ns_addr(name) 52ns_addr(name)
@@ -89,7 +90,7 @@ ns_addr(name)
89 Field(socketname, (u_char *)&addr.x_port, 2); 90 Field(socketname, (u_char *)&addr.x_port, 2);
90 } 91 }
91 92
92 Field(hostname, addr.x_host.c_host, 6); 93 Field(hostname, (u_char *)addr.x_host.c_host, 6);
93 94
94 return (addr); 95 return (addr);
95} 96}
diff --git a/src/lib/libc/net/ns_ntoa.c b/src/lib/libc/net/ns_ntoa.c
index 472675e066..ec03ba0dee 100644
--- a/src/lib/libc/net/ns_ntoa.c
+++ b/src/lib/libc/net/ns_ntoa.c
@@ -32,7 +32,7 @@
32 */ 32 */
33 33
34#if defined(LIBC_SCCS) && !defined(lint) 34#if defined(LIBC_SCCS) && !defined(lint)
35static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.5 1997/07/09 01:08:43 millert Exp $"; 35static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.6 1997/07/21 20:31:06 deraadt Exp $";
36#endif /* LIBC_SCCS and not lint */ 36#endif /* LIBC_SCCS and not lint */
37 37
38#include <sys/param.h> 38#include <sys/param.h>
@@ -46,7 +46,7 @@ ns_ntoa(addr)
46 struct ns_addr addr; 46 struct ns_addr addr;
47{ 47{
48 static char obuf[40]; 48 static char obuf[40];
49 union { union ns_net net_e; u_long long_e; } net; 49 union { union ns_net net_e; u_int32_t long_e; } net;
50 in_port_t port = htons(addr.x_port); 50 in_port_t port = htons(addr.x_port);
51 register char *cp; 51 register char *cp;
52 char *cp2; 52 char *cp2;
@@ -54,7 +54,7 @@ ns_ntoa(addr)
54 u_char *uplim = up + 6; 54 u_char *uplim = up + 6;
55 55
56 net.net_e = addr.x_net; 56 net.net_e = addr.x_net;
57 sprintf(obuf, "%x", ntohl(net.long_e)); 57 sprintf(obuf, "%lx", ntohl(net.long_e));
58 cp = spectHex(obuf); 58 cp = spectHex(obuf);
59 cp2 = cp + 1; 59 cp2 = cp + 1;
60 while (*up==0 && up < uplim) up++; 60 while (*up==0 && up < uplim) up++;