Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use unique_ptr in string_replace()

Browse source 
Eliminates some manual calls to delete
This commit is contained in:
ridiculousfish 2017-01-21 15:47:12 -08:00
parent 3139ad0d4d
commit 754b0e9b91
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/builtin_string.cpp
View file

@ -804,24 +804,22 @@ static int string_replace(parser_t &parser, io_streams_t &streams, int argc, wch
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }
string_replacer_t *replacer; std::unique_ptr<string_replacer_t> replacer;
if (regex) { if (regex) {
replacer = new regex_replacer_t(argv[0], pattern, replacement, opts, streams); replacer = make_unique<regex_replacer_t>(argv[0], pattern, replacement, opts, streams);
} else { } else {
replacer = new literal_replacer_t(argv[0], pattern, replacement, opts, streams); replacer = make_unique<literal_replacer_t>(argv[0], pattern, replacement, opts, streams);
} }
const wchar_t *arg; const wchar_t *arg;
wcstring storage; wcstring storage;
while ((arg = string_get_arg(&i, argv, &storage, streams)) != 0) { while ((arg = string_get_arg(&i, argv, &storage, streams)) != 0) {
if (!replacer->replace_matches(arg)) { if (!replacer->replace_matches(arg)) {
delete replacer;
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }
} }
int rc = replacer->replace_count() > 0 ? BUILTIN_STRING_OK : BUILTIN_STRING_NONE; int rc = replacer->replace_count() > 0 ? BUILTIN_STRING_OK : BUILTIN_STRING_NONE;
delete replacer;
return rc; return rc;
} }