[Xorp-cvs] SF.net SVN: xorp:[11679] trunk/xorp/rtrmgr

[bms_fbsd at users.sourceforge.net]

Revision: 11679
          http://xorp.svn.sourceforge.net/xorp/?rev=11679&view=rev
Author:   bms_fbsd
Date:     2009-12-04 17:06:32 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
The xorpsh doesn't ever need to see the *.xrls files, so remove
any code which references them.

Modified Paths:
--------------
    trunk/xorp/rtrmgr/xorpsh_main.cc
    trunk/xorp/rtrmgr/xorpsh_main.hh

Modified: trunk/xorp/rtrmgr/xorpsh_main.cc
===================================================================
--- trunk/xorp/rtrmgr/xorpsh_main.cc	2009-12-04 16:19:58 UTC (rev 11678)
+++ trunk/xorp/rtrmgr/xorpsh_main.cc	2009-12-04 17:06:32 UTC (rev 11679)
@@ -121,7 +121,6 @@
 		     const string& IPCname,
 		     const string& xorp_root_dir,
 		     const string& config_template_dir,
-		     const string& xrl_targets_dir,
 		     bool verbose) throw (InitError)
     : XrlStdRouter(eventloop, IPCname.c_str()),
       _eventloop(eventloop),
@@ -152,8 +151,6 @@
 	       xorp_root_dir.c_str());
     XLOG_TRACE(_verbose, "Templates directory        := %s\n",
 	       config_template_dir.c_str());
-    XLOG_TRACE(_verbose, "Xrl targets directory      := %s\n",
-	       xrl_targets_dir.c_str());
     XLOG_TRACE(_verbose, "Print verbose information  := %s\n",
 	       bool_c_str(_verbose));
 
@@ -771,7 +768,6 @@
     fprintf(stderr, "  -h        Display this information\n");
     fprintf(stderr, "  -v        Print verbose information\n");
     fprintf(stderr, "  -t <dir>  Specify templates directory\n");
-    fprintf(stderr, "  -x <dir>  Specify Xrl targets directory\n");
 }
 
 static void
@@ -780,8 +776,6 @@
     fprintf(stderr, "Defaults:\n");
     fprintf(stderr, "  Templates directory        := %s\n",
 	    xorp_template_dir().c_str());
-    fprintf(stderr, "  Xrl targets directory      := %s\n",
-	    xorp_xrl_targets_dir().c_str());
     fprintf(stderr, "  Print verbose information  := %s\n",
 	    bool_c_str(default_verbose));
 }
@@ -817,10 +811,11 @@
     //
     xorp_path_init(argv[0]);
     string template_dir		= xorp_template_dir();
-    string xrl_targets_dir	= xorp_xrl_targets_dir();
 
+    static const char optstring[] = "c:et:vh";
+
     int c;
-    while ((c = getopt(argc, argv, "c:et:x:vh")) != EOF) {
+    while ((c = getopt(argc, argv, optstring)) != EOF) {
 	switch(c) {
 	case 'c':
 	    // XXX: Append the arguments to allow multiple "-c cmd" commands
@@ -833,9 +828,6 @@
 	case 't':
 	    template_dir = optarg;
 	    break;
-	case 'x':
-	    xrl_targets_dir = optarg;
-	    break;
 	case 'v':
 	    verbose = true;
 	    break;
@@ -864,7 +856,7 @@
 	string xname = "xorpsh" + c_format("-%d-%s", XORP_INT_CAST(getpid()),
 					   hostname);
 	XorpShell xorpsh(eventloop, xname, xorp_binary_root_dir(),
-			 template_dir, xrl_targets_dir, verbose);
+			 template_dir, verbose);
 	xorpsh.run(commands, exit_on_error);
     } catch (const InitError& e) {
 	XLOG_ERROR("xorpsh exiting due to an init error: %s", e.why().c_str());

Modified: trunk/xorp/rtrmgr/xorpsh_main.hh
===================================================================
--- trunk/xorp/rtrmgr/xorpsh_main.hh	2009-12-04 16:19:58 UTC (rev 11678)
+++ trunk/xorp/rtrmgr/xorpsh_main.hh	2009-12-04 17:06:32 UTC (rev 11679)
@@ -48,7 +48,6 @@
 	      const string& IPCname, 
 	      const string& xorp_root_dir,
 	      const string& config_template_dir, 
-	      const string& xrl_targets_dir,
 	      bool verbose) throw (InitError);
     ~XorpShell();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.