From owner-p4-projects@FreeBSD.ORG  Sun Jun 21 18:22:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9DF8E1065673; Sun, 21 Jun 2009 18:22:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A7171065670
	for <perforce@FreeBSD.org>; Sun, 21 Jun 2009 18:22:20 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 48DF38FC14
	for <perforce@FreeBSD.org>; Sun, 21 Jun 2009 18:22:20 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5LIMJ60045075
	for <perforce@FreeBSD.org>; Sun, 21 Jun 2009 18:22:19 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5LIMJU1045073
	for perforce@freebsd.org; Sun, 21 Jun 2009 18:22:19 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 21 Jun 2009 18:22:19 GMT
Message-Id: <200906211822.n5LIMJU1045073@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 164816 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jun 2009 18:22:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=164816

Change 164816 by pgj@petymeg-current on 2009/06/21 18:21:22

	Improve resolve_portname()

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#32 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#32 (text+ko) ====

@@ -826,12 +826,16 @@
 {
 	struct servent *sp = NULL;
 
-	sp = getservbyport((int)htons(addr->at_port),
-	    addr->at_parent->st_name);
-	if ((sp != NULL || addr->at_port == 0) &&
-	    ((addr->at_flags & ADDRTYPE_ANONPORT) == 0))
-		sprintf(addr->at_portname, "%.15s", sp ? sp->s_name : "*");
-	else
-		sprintf(addr->at_portname, "%d", addr->at_port);
+	if ((addr->at_port == 0) ||
+	    ((addr->at_flags & ADDRTYPE_ANONPORT) != 0)) {
+		sprintf(addr->at_portname, "%.15s", "*");
+	} else {
+		sp = getservbyport((int)htons(addr->at_port),
+		    addr->at_parent->st_name);
+		if (sp != NULL)
+			sprintf(addr->at_portname, "%.15s", sp->s_name);
+		else
+			sprintf(addr->at_portname, "%d", addr->at_port);
+	}
 	addr->at_flags |= ADDRTYPE_PORT_RESOLVED;
 }