Minor cleanup

Jay Berkenbilt
1 parent 59b77510
Showing 6 changed files with 7 additions and 7 deletions
generate_auto_job
include/qpdf/QPDFJob.hh
job.sums
libqpdf/QPDFJob.cc
libqpdf/QPDFJob_argv.cc
libqpdf/QPDFJob_config.cc
@@ -230,7 +230,6 @@ class Main:
                             f'help for unknown option {option},'
                             f' lineno={lineno}')
                     if option not in self.help_options:
-                        # QXXXQ also need to exclude help table
                         self.jdata[option[2:]]['help'] = short_text
                     print(f'ap.addOptionHelp("{option}", "{topic}",'
                           f' "{short_text}", R"({long_text})");', file=f)
@@ -192,8 +192,8 @@ class QPDFJob
       public:
         QPDF_DLL
         PagesConfig& pageSpec(std::string const& filename,
-                              char const* password,
-                              std::string const& range);
+                              std::string const& range,
+                              char const* password = nullptr);
  
 #       include <qpdf/auto_job_c_pages.hh>
  
 # Generated by generate_auto_job
-generate_auto_job 0eaf9d7724199a2a0a57732ea100f2eb55aaa8a1eccea99196190ff4b79fd6e5
+generate_auto_job 207b392d0d199a6cc0e5eb52044e9adbc729323c9a58f9d547605272a0d9b29c
 include/qpdf/auto_job_c_att.hh ecc3f8f711b486b491e811176362a90c022eb225ff12157df3a10ca021be87b1
 include/qpdf/auto_job_c_copy_att.hh caffae3d1faf2cd92a07ba77da638cce31da3e074a047918834195c0f3ed508a
 include/qpdf/auto_job_c_enc.hh e2e1a163a7ffebbf8af169dc4a28ab00df3b8d229864bca7d203dde8b56f0864
@@ -547,6 +547,7 @@ QPDFJob::parseNumrange(char const* range, int max)
 void
 QPDFJob::run()
 {
+    checkConfiguration();
     std::shared_ptr<QPDF> pdf_ph;
     try
     {
@@ -356,7 +356,7 @@ ArgParser::argPagesPositional(char* arg)
     {
         range = "1-z";
     }
-    this->c_pages->pageSpec(file, this->pages_password, range);
+    this->c_pages->pageSpec(file, range, this->pages_password);
     this->accumulated_args.clear();
     this->pages_password = nullptr;
     if (next_file != nullptr)
@@ -932,8 +932,8 @@ QPDFJob::PagesConfig::end()
  
 QPDFJob::PagesConfig&
 QPDFJob::PagesConfig::pageSpec(std::string const& filename,
-                               char const* password,
-                               std::string const& range)
+                               std::string const& range,
+                               char const* password)
 {
     this->config.o.m->page_specs.push_back(
         QPDFJob::PageSpec(filename, password, range));