- (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john

[openssh.git] / openbsd-compat / inet_ntoa.c

diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index fe5539be04ff6094f8331281f468a2dc6f08132d..f9fdc9ee57dc20c8c087ec6964e6f99e93bee1f0 100644 (file)
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@@ -10,11 +10,7 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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.
  *
@@ -31,12 +27,12 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.2 1996/08/19 08:29:16 tholo Exp $";
+static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -47,7 +43,6 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.2 1996/08/19 08:29:16 tholo Exp
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdio.h>
-#include "bsd-inet_ntoa.h"
 
 char *inet_ntoa(struct in_addr in)
 {
@@ -57,7 +52,7 @@ char *inet_ntoa(struct in_addr in)
        p = (char *)&in;
 #define        UC(b)   (((int)b)&0xff)
        (void)snprintf(b, sizeof(b),
-           "%d.%d.%d.%d", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
+           "%u.%u.%u.%u", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
        return (b);
 }