svn commit: r236807 - in stable/9/lib/libc: include net

[Dimitry Andric]

Author: dim
Date: Sat Jun  9 10:06:49 2012
New Revision: 236807
URL: http://svn.freebsd.org/changeset/base/236807

Log:
  MFC r236695:
  
  Fix two warnings about self-assignment in libc.  These normally only
  trigger with clang, when you either use -save-temps, or ccache.
  
  Reported by:	Sevan / Venture37 <venture37 at gmail.com>

Modified:
  stable/9/lib/libc/include/port_before.h
  stable/9/lib/libc/net/getaddrinfo.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/include/port_before.h
==============================================================================
--- stable/9/lib/libc/include/port_before.h	Sat Jun  9 10:04:40 2012	(r236806)
+++ stable/9/lib/libc/include/port_before.h	Sat Jun  9 10:06:49 2012	(r236807)
@@ -17,6 +17,6 @@
                 var = _u.v; \
         } while (0)
 
-#define UNUSED(x) (x) = (x)
+#define UNUSED(x) (void)(x)
 
 #endif /* _PORT_BEFORE_H_ */

Modified: stable/9/lib/libc/net/getaddrinfo.c
==============================================================================
--- stable/9/lib/libc/net/getaddrinfo.c	Sat Jun  9 10:04:40 2012	(r236806)
+++ stable/9/lib/libc/net/getaddrinfo.c	Sat Jun  9 10:06:49 2012	(r236807)
@@ -464,7 +464,7 @@ getaddrinfo(const char *hostname, const 
 		}
 		error = get_portmatch(pai, servname);
 		if (error)
-			ERR(error);
+			goto bad;
 
 		*pai = ai0;
 	}