svn commit: r315901 - head/sbin/devd

[Cy Schubert]

In message <201703241346.v2ODkQtJ019397 at repo.freebsd.org>, Warner Losh 
writes:
> Author: imp
> Date: Fri Mar 24 13:46:26 2017
> New Revision: 315901
> URL: https://svnweb.freebsd.org/changeset/base/315901
> 
> Log:
>   Use a more stream-lined version of fix_value.
>   
>   Submitted by: ian@
> 
> Modified:
>   head/sbin/devd/devd.cc
>   head/sbin/devd/devd.hh
> 
> Modified: head/sbin/devd/devd.cc
> =============================================================================
> =
> --- head/sbin/devd/devd.cc	Fri Mar 24 11:46:49 2017	(r315900)
> +++ head/sbin/devd/devd.cc	Fri Mar 24 13:46:26 2017	(r315901)
> @@ -417,24 +417,16 @@ var_list::is_set(const string &var) cons
>   * converted to ". For all other characters, both \ and following
>   * character. So the string 'fre\:\"' is translated to 'fred\:"'.
>   */
> -const std::string &
> +std::string
>  var_list::fix_value(const std::string &val) const
>  {
> -	char *tmp, *dst;
> -	const char *src;
> -	std::string *rv;
> -
> -	dst = tmp = new char[val.length()];
> -	src = val.c_str();
> -	while (*src) {
> -		if (*src == '\\' && src[1] == '"')
> -			src++;
> -		else
> -			*dst++ = *src++;
> -	}
> -	rv = new string(tmp);
> -	delete tmp;
> -	return *rv;
> +        std::string rv(val);
> +        std::string::size_type pos(0);
> +
> +        while ((pos = rv.find("\\\"", pos)) != rv.npos) {
> +                rv.erase(pos, 1);
> +        }
> +        return (rv);
>  }
>  
>  void
> 
> Modified: head/sbin/devd/devd.hh
> =============================================================================
> =
> --- head/sbin/devd/devd.hh	Fri Mar 24 11:46:49 2017	(r315900)
> +++ head/sbin/devd/devd.hh	Fri Mar 24 13:46:26 2017	(r315901)
> @@ -57,7 +57,7 @@ public:
>  	static const std::string nothing;
>  
>  private:
> -	const std::string &fix_value(const std::string &val) const;
> +	std::string fix_value(const std::string &val) const;
>  
>  	std::map<std::string, std::string> _vars;
>  };
> 
> 

Thank you Warner.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.