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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to