Index: lib/libc/include/port_before.h
===================================================================
--- lib/libc/include/port_before.h	(revision 236667)
+++ lib/libc/include/port_before.h	(working copy)
@@ -17,6 +17,6 @@
                 var = _u.v; \
         } while (0)
 
-#define UNUSED(x) (x) = (x)
+#define UNUSED(x) (void)(x)
 
 #endif /* _PORT_BEFORE_H_ */
Index: lib/libc/net/getaddrinfo.c
===================================================================
--- lib/libc/net/getaddrinfo.c	(revision 236667)
+++ lib/libc/net/getaddrinfo.c	(working copy)
@@ -464,7 +464,7 @@ getaddrinfo(const char *hostname, const char *serv
 		}
 		error = get_portmatch(pai, servname);
 		if (error)
-			ERR(error);
+			goto bad;
 
 		*pai = ai0;
 	}