From owner-svn-src-head@FreeBSD.ORG  Sat May 30 19:23:09 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B43F01065670;
	Sat, 30 May 2009 19:23:09 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A25888FC13;
	Sat, 30 May 2009 19:23:09 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJN9Qx016730;
	Sat, 30 May 2009 19:23:09 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UJN9S8016729;
	Sat, 30 May 2009 19:23:09 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200905301923.n4UJN9S8016729@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 30 May 2009 19:23:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193109 - head/lib/libstand
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2009 19:23:10 -0000

Author: marcel
Date: Sat May 30 19:23:09 2009
New Revision: 193109
URL: http://svn.freebsd.org/changeset/base/193109

Log:
  Print the returned port number when RPC_DEBUG is defined.
  This improves debugging.

Modified:
  head/lib/libstand/rpc.c

Modified: head/lib/libstand/rpc.c
==============================================================================
--- head/lib/libstand/rpc.c	Sat May 30 19:21:56 2009	(r193108)
+++ head/lib/libstand/rpc.c	Sat May 30 19:23:09 2009	(r193109)
@@ -405,17 +405,19 @@ rpc_getport(d, prog, vers)
 
 #ifdef RPC_DEBUG
 	if (debug)
-		printf("getport: prog=0x%x vers=%d\n", prog, vers);
+		printf("%s: prog=0x%x vers=%d\n", __func__, prog, vers);
 #endif
 
 	/* This one is fixed forever. */
-	if (prog == PMAPPROG)
-		return (PMAPPORT);
+	if (prog == PMAPPROG) {
+		port = PMAPPORT;
+		goto out;
+	}
 
 	/* Try for cached answer first */
 	port = rpc_pmap_getcache(d->destip, prog, vers);
 	if (port != -1)
-		return (port);
+		goto out;
 
 	args = &sdata.d;
 	args->prog = htonl(prog);
@@ -435,5 +437,10 @@ rpc_getport(d, prog, vers)
 
 	rpc_pmap_putcache(d->destip, prog, vers, port);
 
+out:
+#ifdef RPC_DEBUG
+	if (debug)
+		printf("%s: port=%u\n", __func__, port);
+#endif
 	return (port);
 }