From owner-svn-src-stable-9@FreeBSD.ORG  Thu Dec 20 00:37:12 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C18D6B07;
 Thu, 20 Dec 2012 00:37:12 +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 A4F7F8FC0C;
 Thu, 20 Dec 2012 00:37:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBK0bC03023022;
 Thu, 20 Dec 2012 00:37:12 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBK0bCdT023019;
 Thu, 20 Dec 2012 00:37:12 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212200037.qBK0bCdT023019@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 20 Dec 2012 00:37:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244470 - stable/9/sbin/devd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 00:37:12 -0000

Author: eadler
Date: Thu Dec 20 00:37:11 2012
New Revision: 244470
URL: http://svnweb.freebsd.org/changeset/base/244470

Log:
  MFC r243932:
  	Prefer the use of initalizer lists to ctor assignment.
  
  Approved by:	cperciva (implicit)

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

Modified: stable/9/sbin/devd/devd.cc
==============================================================================
--- stable/9/sbin/devd/devd.cc	Thu Dec 20 00:35:26 2012	(r244469)
+++ stable/9/sbin/devd/devd.cc	Thu Dec 20 00:37:11 2012	(r244470)
@@ -248,9 +248,8 @@ action::do_action(config &c)
 }
 
 match::match(config &c, const char *var, const char *re)
-	: _var(var)
+	: _var(var), _re("^")
 {
-	_re = "^";
 	_re.append(c.expand_string(string(re)));
 	_re.append("$");
 	regcomp(&_regex, _re.c_str(), REG_EXTENDED | REG_NOSUB | REG_ICASE);

Modified: stable/9/sbin/devd/devd.hh
==============================================================================
--- stable/9/sbin/devd/devd.hh	Thu Dec 20 00:35:26 2012	(r244469)
+++ stable/9/sbin/devd/devd.hh	Thu Dec 20 00:37:11 2012	(r244470)
@@ -143,7 +143,7 @@ private:
 class config
 {
 public:
-	config() { _pidfile = ""; push_var_table(); }
+	config() : _pidfile("") { push_var_table(); }
 	virtual ~config() { reset(); }
 	void add_attach(int, event_proc *);
 	void add_detach(int, event_proc *);