From owner-svn-src-head@FreeBSD.ORG  Mon Mar  4 02:21:20 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5B7B6B8A;
 Mon,  4 Mar 2013 02:21:20 +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 4F6313A4;
 Mon,  4 Mar 2013 02:21:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r242LKYp084988;
 Mon, 4 Mar 2013 02:21:20 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r242LKGY084987;
 Mon, 4 Mar 2013 02:21:20 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201303040221.r242LKGY084987@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 4 Mar 2013 02:21:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247758 - head/sbin/devd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Mar 2013 02:21:20 -0000

Author: eadler
Date: Mon Mar  4 02:21:19 2013
New Revision: 247758
URL: http://svnweb.freebsd.org/changeset/base/247758

Log:
  devd: Avoid unnecessary temporary objects (and simplify the code) when handling std::string.
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
  Approved by:	cperciva (mentor)

Modified:
  head/sbin/devd/devd.cc

Modified: head/sbin/devd/devd.cc
==============================================================================
--- head/sbin/devd/devd.cc	Mon Mar  4 02:21:17 2013	(r247757)
+++ head/sbin/devd/devd.cc	Mon Mar  4 02:21:19 2013	(r247758)
@@ -460,7 +460,7 @@ config::open_pidfile()
 {
 	pid_t otherpid;
 	
-	if (_pidfile == "")
+	if (_pidfile.empty())
 		return;
 	pfh = pidfile_open(_pidfile.c_str(), 0600, &otherpid);
 	if (pfh == NULL) {
@@ -528,7 +528,7 @@ config::add_notify(int prio, event_proc 
 void
 config::set_pidfile(const char *fn)
 {
-	_pidfile = string(fn);
+	_pidfile = fn;
 }
 
 void
@@ -617,7 +617,7 @@ config::expand_one(const char *&src, str
 	do {
 		buffer.append(src++, 1);
 	} while (is_id_char(*src));
-	dst.append(get_variable(buffer.c_str()));
+	dst.append(get_variable(buffer));
 }
 
 const string