From owner-svn-src-stable-9@FreeBSD.ORG  Sat Jun  9 10:06:49 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BA57B1065675;
	Sat,  9 Jun 2012 10:06:49 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A4FAB8FC1E;
	Sat,  9 Jun 2012 10:06:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q59A6nMR022320;
	Sat, 9 Jun 2012 10:06:49 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q59A6nFU022317;
	Sat, 9 Jun 2012 10:06:49 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201206091006.q59A6nFU022317@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 9 Jun 2012 10:06:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236807 - in stable/9/lib/libc: include net
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jun 2012 10:06:49 -0000

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@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;
 	}