svn commit: r259984 - in stable: 10/sys/rpc 9/sys/rpc

[Dimitry Andric]

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 <rpc/rpc_com.h>
 
 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