From owner-svn-src-all@FreeBSD.ORG Sat Dec 28 01:26:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F7C5187; Sat, 28 Dec 2013 01:26:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 211761169; Sat, 28 Dec 2013 01:26:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBS1QRPH021261; Sat, 28 Dec 2013 01:26:27 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBS1QRIv021258; Sat, 28 Dec 2013 01:26:27 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201312280126.rBS1QRIv021258@svn.freebsd.org> From: Dimitry Andric Date: Sat, 28 Dec 2013 01:26:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259984 - in stable: 10/sys/rpc 9/sys/rpc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 01:26:28 -0000 Author: dim Date: Sat Dec 28 01:26:26 2013 New Revision: 259984 URL: http://svnweb.freebsd.org/changeset/base/259984 Log: MFC r259842: Remove some unused static const strings under sys/rpc, which have never been used since the initial commit (r177633). MFC r259843: Move a static const variable to the #if 0 part where it is only used. (Note the #if 0 part has been inactive since the initial commit, r177633, so maybe it should be removed altogether). Modified: stable/10/sys/rpc/clnt_dg.c stable/10/sys/rpc/clnt_vc.c stable/10/sys/rpc/rpcb_clnt.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/rpc/clnt_dg.c stable/9/sys/rpc/clnt_vc.c stable/9/sys/rpc/rpcb_clnt.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/rpc/clnt_dg.c ============================================================================== --- stable/10/sys/rpc/clnt_dg.c Sat Dec 28 01:19:48 2013 (r259983) +++ stable/10/sys/rpc/clnt_dg.c Sat Dec 28 01:26:26 2013 (r259984) @@ -93,8 +93,6 @@ static struct clnt_ops clnt_dg_ops = { .cl_control = clnt_dg_control }; -static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory"; - /* * A pending RPC request which awaits a reply. Requests which have * received their reply will have cr_xid set to zero and cr_mrep to Modified: stable/10/sys/rpc/clnt_vc.c ============================================================================== --- stable/10/sys/rpc/clnt_vc.c Sat Dec 28 01:19:48 2013 (r259983) +++ stable/10/sys/rpc/clnt_vc.c Sat Dec 28 01:26:26 2013 (r259984) @@ -108,11 +108,6 @@ static struct clnt_ops clnt_vc_ops = { static void clnt_vc_upcallsdone(struct ct_data *); -static const char clnt_vc_errstr[] = "%s : %s"; -static const char clnt_vc_str[] = "clnt_vc_create"; -static const char clnt_read_vc_str[] = "read_vc"; -static const char __no_mem_str[] = "out of memory"; - /* * Create a client handle for a connection. * Default options are set, which the user can change using clnt_control()'s. Modified: stable/10/sys/rpc/rpcb_clnt.c ============================================================================== --- stable/10/sys/rpc/rpcb_clnt.c Sat Dec 28 01:19:48 2013 (r259983) +++ stable/10/sys/rpc/rpcb_clnt.c Sat Dec 28 01:26:26 2013 (r259984) @@ -82,13 +82,13 @@ __FBSDID("$FreeBSD$"); #include static struct timeval tottimeout = { 60, 0 }; -static const struct timeval rmttimeout = { 3, 0 }; static const char nullstring[] = "\000"; static CLIENT *local_rpcb(void); #if 0 +static const struct timeval rmttimeout = { 3, 0 }; static struct timeval rpcbrmttime = { 15, 0 }; #define CACHESIZE 6