From owner-svn-src-all@FreeBSD.ORG  Mon Feb  4 00:34:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5E880565;
 Mon,  4 Feb 2013 00:34:36 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 387F7159;
 Mon,  4 Feb 2013 00:34:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r140YaoC006612;
 Mon, 4 Feb 2013 00:34:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r140YZbe006610;
 Mon, 4 Feb 2013 00:34:35 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302040034.r140YZbe006610@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 4 Feb 2013 00:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r246311 - stable/7/sbin/devd
X-SVN-Group: stable-7
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.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Feb 2013 00:34:36 -0000

Author: eadler
Date: Mon Feb  4 00:34:35 2013
New Revision: 246311
URL: http://svnweb.freebsd.org/changeset/base/246311

Log:
  MFC r243930:
  	Constify where possible
  
  Approved by:	cperciva (mentor, implicit)

Modified:
  stable/7/sbin/devd/devd.cc
  stable/7/sbin/devd/devd.hh
Directory Properties:
  stable/7/sbin/devd/   (props changed)

Modified: stable/7/sbin/devd/devd.cc
==============================================================================
--- stable/7/sbin/devd/devd.cc	Mon Feb  4 00:34:34 2013	(r246310)
+++ stable/7/sbin/devd/devd.cc	Mon Feb  4 00:34:35 2013	(r246311)
@@ -120,7 +120,7 @@ event_proc::add(eps *eps)
 }
 
 bool
-event_proc::matches(config &c)
+event_proc::matches(config &c) const
 {
 	vector<eps *>::const_iterator i;
 
@@ -131,7 +131,7 @@ event_proc::matches(config &c)
 }
 
 bool
-event_proc::run(config &c)
+event_proc::run(config &c) const
 {
 	vector<eps *>::const_iterator i;
 		
@@ -342,7 +342,7 @@ config::parse_files_in_dir(const char *d
 
 class epv_greater {
 public:
-	int operator()(event_proc *const&l1, event_proc *const&l2)
+	int operator()(event_proc *const&l1, event_proc *const&l2) const
 	{
 		return (l1->get_priority() > l2->get_priority());
 	}
@@ -476,7 +476,7 @@ config::get_variable(const string &var)
 }
 
 bool
-config::is_id_char(char ch)
+config::is_id_char(char ch) const
 {
 	return (ch != '\0' && (isalpha(ch) || isdigit(ch) || ch == '_' || 
 	    ch == '-'));

Modified: stable/7/sbin/devd/devd.hh
==============================================================================
--- stable/7/sbin/devd/devd.hh	Mon Feb  4 00:34:34 2013	(r246310)
+++ stable/7/sbin/devd/devd.hh	Mon Feb  4 00:34:35 2013	(r246311)
@@ -133,8 +133,8 @@ public:
 	int get_priority() const { return (_prio); }
 	void set_priority(int prio) { _prio = prio; }
 	void add(eps *);
-	bool matches(config &);
-	bool run(config &);
+	bool matches(config &) const;
+	bool run(config &) const;
 private:
 	int _prio;
 	std::vector<eps *> _epsvec;
@@ -168,7 +168,7 @@ protected:
 	void parse_one_file(const char *fn);
 	void parse_files_in_dir(const char *dirname);
 	void expand_one(const char *&src, std::string &dst);
-	bool is_id_char(char);
+	bool is_id_char(char) const;
 	bool chop_var(char *&buffer, char *&lhs, char *&rhs);
 private:
 	std::vector<std::string> _dir_list;