From patchwork Thu Jun 23 02:26:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 907932 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5N2PtTZ022440 for ; Thu, 23 Jun 2011 02:25:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758583Ab1FWCZ5 (ORCPT ); Wed, 22 Jun 2011 22:25:57 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:41599 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758449Ab1FWCZ5 (ORCPT ); Wed, 22 Jun 2011 22:25:57 -0400 Received: by gyh3 with SMTP id 3so562081gyh.19 for ; Wed, 22 Jun 2011 19:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=uAuI8WCxmdpzJGW3iCXjA4+E32gHhhOrw8EY/bmxVY8=; b=ZzvfjS7s3tvvQ1ZUBFL22WzKOhRq6ob1IRLUAtnT/STdOWIr/89idokX5aFwT1OfQk cbrBLzemI6pkWe7u6RhCk1CEE3QshH7N+aS5i2Sk9rjpYPnwkvQvkFgTYZ6aajoDa1ja cCDARo2ChqHw7uY5IAGcL1nym7iqDyb2zBaRY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=nox9eHvvflFRmb5xc8q5yIBlozelbixngwJQiMzWISx8JQCS+UCKIaHudZEP2GcoWP aJu66Fw6UTUcmq4Gq7difaqii2p4DCoEBx/XQolFqdAfOIDUgKu/bUiJ9wJ8RpDjRq/e bNl7KCI2BcXcIOx/QIfo7pwYMAFWQcRZ6Dy/s= Received: by 10.91.173.11 with SMTP id a11mr1662512agp.105.1308795956483; Wed, 22 Jun 2011 19:25:56 -0700 (PDT) Received: from localhost.localdomain (ip68-0-89-31.tu.ok.cox.net [68.0.89.31]) by mx.google.com with ESMTPS id g2sm1113704ano.14.2011.06.22.19.25.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Jun 2011 19:25:55 -0700 (PDT) From: Tom Haynes To: Steve Dickson Cc: linux-nfs@vger.kernel.org, Tom Haynes Subject: [PATCH 1/2] Multiple clnt_broadcast, rename static reference Date: Wed, 22 Jun 2011 21:26:06 -0500 Message-Id: <1308795967-7605-2-git-send-email-tdh@excfb.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1308795967-7605-1-git-send-email-tdh@excfb.com> References: <1308795967-7605-1-git-send-email-tdh@excfb.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 23 Jun 2011 02:25:58 +0000 (UTC) Signed-off-by: Tom Haynes --- tools/pmapbrd.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/pmapbrd.c b/tools/pmapbrd.c index c447ced..2bb05b6 100644 --- a/tools/pmapbrd.c +++ b/tools/pmapbrd.c @@ -98,7 +98,7 @@ static bool_t xdr_rmtcallres ARGS_((XDR *, struct rmtcallres *)); #define RPROC_NUM (u_long)1 #endif -static enum clnt_stat clnt_broadcast ARGS_((int, unsigned long, unsigned long, +static enum clnt_stat clnt_broadcast_time ARGS_((int, unsigned long, unsigned long, unsigned long, xdrproc_t, void *, xdrproc_t, void *, resultproc_t, struct timeval *)); @@ -174,7 +174,7 @@ main(argc, argv) * XXX shouldn't have to cast eachresult? */ clnt_stat = - clnt_broadcast(sock, RPROG, RVERS, RPROC_NUM, xdr_void, &a, + clnt_broadcast_time(sock, RPROG, RVERS, RPROC_NUM, xdr_void, &a, xdr_void, &b, (resultproc_t)eachresult, &t); if(clnt_stat != RPC_TIMEDOUT) { printf("error: clnt_stat = %d\n", clnt_stat); @@ -305,7 +305,8 @@ getbroadcastnets(sock, buf) } static enum clnt_stat -clnt_broadcast(sock, prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult, t) +clnt_broadcast_time(sock, prog, vers, proc, xargs, argsp, xresults, + resultsp, eachresult, t) int sock; #ifdef SVR3 ulong prog; /* program number */