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 builtin_string

Browse source 
Avoids manual calls to delete
This commit is contained in:
ridiculousfish 2017-01-21 14:53:29 -08:00
parent f2884343b3
commit 5b108efde4
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

@ -570,24 +570,22 @@ static int string_match(parser_t &parser, io_streams_t &streams, int argc, wchar
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }
string_matcher_t *matcher; std::unique_ptr<string_matcher_t> matcher;
if (regex) { if (regex) {
matcher = new pcre2_matcher_t(argv[0], pattern, opts, streams); matcher.reset(new pcre2_matcher_t(argv[0], pattern, opts, streams));
} else { } else {
matcher = new wildcard_matcher_t(argv[0], pattern, opts, streams); matcher.reset(new wildcard_matcher_t(argv[0], pattern, 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 (!matcher->report_matches(arg)) { if (!matcher->report_matches(arg)) {
delete matcher;
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }
} }
int rc = matcher->match_count() > 0 ? BUILTIN_STRING_OK : BUILTIN_STRING_NONE; int rc = matcher->match_count() > 0 ? BUILTIN_STRING_OK : BUILTIN_STRING_NONE;
delete matcher;
return rc; return rc;
} }