In QPDFArgParser refactor argv handling to use `std::string` instead of shared pointers.

Replaces `std::shared_ptr<char const>` with `std::string` for `new_argv` and `bash_argv` to simplify memory management and improve clarity. Updated relevant operations to use `std::string` methods, eliminating unnecessary shared pointer usage.

In QPDFArgParser refactor argv handling to use `std::string` instead of shared pointers.
Replaces `std::shared_ptr<char const>` with `std::string` for `new_argv` and `bash_argv` to simplify memory management and improve clarity. Updated relevant operations to use `std::string` methods, eliminating unnecessary shared pointer usage.
m-holger
1 parent b53923d1
Showing 2 changed files with 9 additions and 9 deletions
libqpdf/QPDFArgParser.cc
libqpdf/qpdf/QPDFArgParser.hh
@@ -239,7 +239,7 @@ QPDFArgParser::handleArgFileArguments()
     // Support reading arguments from files. Create a new argv. Ensure that argv itself as well as
     // all its contents are automatically deleted by using shared pointers back to the pointers in
     // argv.
-    m->new_argv.push_back(QUtil::make_shared_cstr(m->argv[0]));
+    m->new_argv.emplace_back(m->argv[0]);
     for (int i = 1; i < m->argc; ++i) {
         char const* argfile = nullptr;
         if ((strlen(m->argv[i]) > 1) && (m->argv[i][0] == '@')) {
@@ -254,12 +254,12 @@ QPDFArgParser::handleArgFileArguments()
         if (argfile) {
             readArgsFromFile(1 + m->argv[i]);
         } else {
-            m->new_argv.push_back(QUtil::make_shared_cstr(m->argv[i]));
+            m->new_argv.emplace_back(m->argv[i]);
         }
     }
     m->argv_ph = QUtil::make_shared_array<char const*>(1 + m->new_argv.size());
     for (size_t i = 0; i < m->new_argv.size(); ++i) {
-        m->argv_ph.get()[i] = m->new_argv.at(i).get();
+        m->argv_ph.get()[i] = m->new_argv.at(i).data();
     }
     m->argc = QIntC::to_int(m->new_argv.size());
     m->argv_ph.get()[m->argc] = nullptr;
@@ -290,7 +290,7 @@ QPDFArgParser::handleBashArguments()
             case st_top:
                 if (util::is_space(ch)) {
                     if (!arg.empty()) {
-                        m->bash_argv.push_back(QUtil::make_shared_cstr(arg));
+                        m->bash_argv.emplace_back(arg);
                         arg.clear();
                     }
                 } else if (ch == '"') {
@@ -326,12 +326,12 @@ QPDFArgParser::handleBashArguments()
     if (m->bash_argv.empty()) {
         // This can't happen if properly invoked by bash, but ensure we have a valid argv[0]
         // regardless.
-        m->bash_argv.push_back(QUtil::make_shared_cstr(m->argv[0]));
+        m->bash_argv.emplace_back(m->argv[0]);
     }
     // Explicitly discard any non-space-terminated word. The "current word" is handled specially.
     m->bash_argv_ph = QUtil::make_shared_array<char const*>(1 + m->bash_argv.size());
     for (size_t i = 0; i < m->bash_argv.size(); ++i) {
-        m->bash_argv_ph.get()[i] = m->bash_argv.at(i).get();
+        m->bash_argv_ph.get()[i] = m->bash_argv.at(i).data();
     }
     m->argc = QIntC::to_int(m->bash_argv.size());
     m->bash_argv_ph.get()[m->argc] = nullptr;
@@ -360,7 +360,7 @@ QPDFArgParser::readArgsFromFile(std::string const&amp; filename)
         lines = QUtil::read_lines_from_file(filename.c_str());
     }
     for (auto const& line: lines) {
-        m->new_argv.push_back(QUtil::make_shared_cstr(line));
+        m->new_argv.emplace_back(line);
     }
 }
@@ -219,8 +219,8 @@ class QPDFArgParser
         option_table_t* option_table;
         std::string option_table_name;
         bare_arg_handler_t final_check_handler;
-        std::vector<std::shared_ptr<char const>> new_argv;
-        std::vector<std::shared_ptr<char const>> bash_argv;
+        std::vector<std::string> new_argv;
+        std::vector<std::string> bash_argv;
         std::shared_ptr<char const*> argv_ph;
         std::shared_ptr<char const*> bash_argv_ph;
         std::map<std::string, HelpTopic> help_topics;