Replace dynamic array for std::vector

main
Luis Díaz Más 3 years ago
parent 67f574556e
commit 06ff936d06

@ -1039,7 +1039,7 @@ using long_t = std::map<std::string, std::string>;
int Params::getopt(int argc, char* const Argv[]) int Params::getopt(int argc, char* const Argv[])
{ {
auto argv = new char*[argc + 1]; std::vector<char *> argv(argc+1);
argv[argc] = nullptr; argv[argc] = nullptr;
long_t longs; long_t longs;
@ -1084,7 +1084,7 @@ int Params::getopt(int argc, char* const Argv[])
} }
} }
int rc = Util::Getopt::getopt(argc, argv, optstring_); int rc = Util::Getopt::getopt(argc, argv.data(), optstring_);
// Further consistency checks // Further consistency checks
if (help_ || version_) { if (help_ || version_) {
goto cleanup; goto cleanup;
@ -1157,10 +1157,9 @@ int Params::getopt(int argc, char* const Argv[])
// cleanup the argument vector // cleanup the argument vector
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
::free(argv[i]); ::free(argv[i]);
delete [] argv;
return rc; return rc;
} // Params::getopt }
// ***************************************************************************** // *****************************************************************************
// local implementations // local implementations

Loading…
Cancel
Save