about summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/gethstbyad.c4
-rw-r--r--inet/gethstbyad_r.c10
-rw-r--r--inet/getipnodebyad.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/inet/gethstbyad.c b/inet/gethstbyad.c
index 8183ddfd28..31ac813222 100644
--- a/inet/gethstbyad.c
+++ b/inet/gethstbyad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -23,7 +23,7 @@
 #define LOOKUP_TYPE	struct hostent
 #define FUNCTION_NAME	gethostbyaddr
 #define DATABASE_NAME	hosts
-#define ADD_PARAMS	const char *addr, size_t len, int type
+#define ADD_PARAMS	const void *addr, socklen_t len, int type
 #define ADD_VARIABLES	addr, len, type
 #define BUFLEN		1024
 #define NEED_H_ERRNO	1
diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c
index 137bdf9323..8edb6d0104 100644
--- a/inet/gethstbyad_r.c
+++ b/inet/gethstbyad_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,7 +24,7 @@
 #define LOOKUP_TYPE	struct hostent
 #define FUNCTION_NAME	gethostbyaddr
 #define DATABASE_NAME	hosts
-#define ADD_PARAMS	const char *addr, size_t len, int type
+#define ADD_PARAMS	const void *addr, socklen_t len, int type
 #define ADD_VARIABLES	addr, len, type
 #define NEED_H_ERRNO	1
 #define NEED__RES	1
@@ -32,9 +32,9 @@
 /* If the addr parameter is the IPv6 unspecified address no query must
    be performed.  */
 #define PREPROCESS \
-  if (__builtin_expect (len == sizeof (struct in6_addr)			      \
-			&& memcmp (&in6addr_any, addr,			      \
-				   sizeof (struct in6_addr)) == 0, 0))	      \
+  if (len == sizeof (struct in6_addr)					      \
+      && __builtin_expect (memcmp (&in6addr_any, addr,			      \
+				   sizeof (struct in6_addr)), 1) == 0)	      \
     {									      \
       *h_errnop = HOST_NOT_FOUND;					      \
       *result = NULL;							      \
diff --git a/inet/getipnodebyad.c b/inet/getipnodebyad.c
index d9d5ba8887..1128bcb30f 100644
--- a/inet/getipnodebyad.c
+++ b/inet/getipnodebyad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 
 
 struct hostent *
-getipnodebyaddr (const char *addr, size_t len, int type, int *error_num)
+getipnodebyaddr (const void *addr, socklen_t len, int type, int *error_num)
 {
   size_t buffer_size;
   char *buffer;