From 93f8a2e834eed69aff7ef3be8c2baba14bab0658 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Sep 2009 23:07:26 +0200 Subject: convert // comments to /**/; remove empty #if/#endif pairs. no code changes Signed-off-by: Denys Vlasenko --- libc/inet/addr.c | 3 --- libc/inet/getaddrinfo.c | 5 ----- libc/inet/if_index.c | 8 ++++---- libc/inet/inet_net.c | 4 ---- libc/inet/rpc/auth_unix.c | 3 --- libc/inet/rpc/clnt_perror.c | 3 --- libc/inet/rpc/clnt_tcp.c | 3 --- libc/inet/rpc/rcmd.c | 4 ---- 8 files changed, 4 insertions(+), 29 deletions(-) (limited to 'libc/inet') diff --git a/libc/inet/addr.c b/libc/inet/addr.c index 8bef59ffa..c71d4d4f7 100644 --- a/libc/inet/addr.c +++ b/libc/inet/addr.c @@ -43,9 +43,6 @@ * leading 0 -> octal * all else -> decimal */ -#ifdef __UCLIBC_HAS_XLOCALE__ -#elif defined __UCLIBC_HAS_CTYPE_TABLES__ -#endif int inet_aton(const char *cp, struct in_addr *addrptr) { in_addr_t addr; diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c index a9fe3c884..b91486f53 100644 --- a/libc/inet/getaddrinfo.c +++ b/libc/inet/getaddrinfo.c @@ -70,9 +70,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#ifdef __UCLIBC_HAS_IPV6__ -#endif - #define GAIH_OKIFUNSPEC 0x0100 #define GAIH_EAI ~(GAIH_OKIFUNSPEC) @@ -638,8 +635,6 @@ gaih_inet(const char *name, const struct gaih_service *service, do { tmpbuflen *= 2; tmpbuf = alloca(tmpbuflen); - //if (tmpbuf == NULL) - // return -EAI_MEMORY; rc = gethostbyaddr_r(at2->addr, ((at2->family == AF_INET6) ? sizeof(struct in6_addr) diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c index 36012975f..750a4649e 100644 --- a/libc/inet/if_index.c +++ b/libc/inet/if_index.c @@ -53,11 +53,11 @@ if_nametoindex(const char* ifname) strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl (fd, SIOCGIFINDEX, &ifr) < 0) { - // close never fails here, fd is just a unconnected socket - //int saved_errno = errno; + /* close never fails here, fd is just a unconnected socket. + *int saved_errno = errno; */ close(fd); - //if (saved_errno == EINVAL) - // __set_errno(ENOSYS); + /*if (saved_errno == EINVAL) + * __set_errno(ENOSYS); */ return 0; } diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c index 6bade8aee..3740311f9 100644 --- a/libc/inet/inet_net.c +++ b/libc/inet/inet_net.c @@ -38,10 +38,6 @@ #include #include -#ifdef __UCLIBC_HAS_XLOCALE__ -#elif defined __UCLIBC_HAS_CTYPE_TABLES__ -#endif - /* * Internet network address interpretation routine. * The library routines call this routine to interpret diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c index f71a426f8..1337214e5 100644 --- a/libc/inet/rpc/auth_unix.c +++ b/libc/inet/rpc/auth_unix.c @@ -56,9 +56,6 @@ # include #endif -#ifdef USE_IN_LIBIO -#endif - /* * Unix authenticator operations vector */ diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c index b3aedc558..8dbae729f 100644 --- a/libc/inet/rpc/clnt_perror.c +++ b/libc/inet/rpc/clnt_perror.c @@ -51,9 +51,6 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro"; # define fputs(s, f) _IO_fputs (s, f) #endif -#ifdef USE_IN_LIBIO -#endif - static char *auth_errmsg (enum auth_stat stat) internal_function; #ifdef __UCLIBC_HAS_THREADS__ diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c index a6d4fbd42..26abc3e17 100644 --- a/libc/inet/rpc/clnt_tcp.c +++ b/libc/inet/rpc/clnt_tcp.c @@ -65,9 +65,6 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; # include #endif -#ifdef USE_IN_LIBIO -#endif - extern u_long _create_xid (void) attribute_hidden; #define MCALL_MSG_SIZE 24 diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index f34e92db6..745ea776a 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -87,10 +87,6 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif #include -#ifdef __UCLIBC_HAS_XLOCALE__ -#elif defined __UCLIBC_HAS_CTYPE_TABLES__ -#endif - /* some forward declarations */ static int __ivaliduser2(FILE *hostf, u_int32_t raddr, -- cgit v1.2.3