[src/netbsd-1-6]: src/lib/libc/net Pull up revision 1.48 (requested by tron):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e1bb1d5590b
branches:  netbsd-1-6
changeset: 527550:9e1bb1d5590b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue May 28 04:24:33 2002 +0000

description:
Pull up revision 1.48 (requested by tron):
Revert last change after protoype of getnameinfo(3) has been changed back.

diffstat:

 lib/libc/net/rcmd.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 472e4fbf1af8 -r 9e1bb1d5590b lib/libc/net/rcmd.c
--- a/lib/libc/net/rcmd.c       Tue May 28 04:15:17 2002 +0000
+++ b/lib/libc/net/rcmd.c       Tue May 28 04:24:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcmd.c,v 1.47 2002/05/14 23:58:08 thorpej Exp $        */
+/*     $NetBSD: rcmd.c,v 1.47.2.1 2002/05/28 04:24:33 lukem Exp $      */
 
 /*
  * Copyright (c) 1997 Matthew R. Green.
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)rcmd.c     8.3 (Berkeley) 3/26/94";
 #else
-__RCSID("$NetBSD: rcmd.c,v 1.47 2002/05/14 23:58:08 thorpej Exp $");
+__RCSID("$NetBSD: rcmd.c,v 1.47.2.1 2002/05/28 04:24:33 lukem Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -268,9 +268,9 @@
                        int oerrno = errno;
                        char hbuf[NI_MAXHOST];
 #ifdef NI_WITHSCOPEID
-                       const u_int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
+                       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
 #else
-                       const u_int niflags = NI_NUMERICHOST;
+                       const int niflags = NI_NUMERICHOST;
 #endif
 
                        hbuf[0] = '\0';
@@ -933,9 +933,9 @@
        char h1[NI_MAXHOST], h2[NI_MAXHOST];
        int error;
 #ifdef NI_WITHSCOPEID
-       const u_int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
+       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
 #else
-       const u_int niflags = NI_NUMERICHOST;
+       const int niflags = NI_NUMERICHOST;
 #endif
 
        _DIAGASSERT(raddr != NULL);
@@ -992,9 +992,9 @@
        struct addrinfo hints, *res, *r;
        int error;
 #ifdef NI_WITHSCOPEID
-       const u_int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
+       const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
 #else
-       const u_int niflags = NI_NUMERICHOST;
+       const int niflags = NI_NUMERICHOST;
 #endif
 
        _DIAGASSERT(raddr != NULL);