From 9373881cca0c781c66b2b50b962bdbc26364abe5 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Tue, 25 Jan 2022 16:40:35 -0500
Subject: Add QPDFJob::ConfigError exception

---
 libqpdf/QPDFJob.cc        |  5 +++++
 libqpdf/QPDFJob_config.cc | 20 +++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index ca479812..eb06e076 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -33,6 +33,11 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QIntC.hh>
 
+QPDFJob::ConfigError::ConfigError(std::string const& msg) :
+    std::runtime_error(msg)
+{
+}
+
 namespace
 {
     class ImageOptimizer: public QPDFObjectHandle::StreamDataProvider
diff --git a/libqpdf/QPDFJob_config.cc b/libqpdf/QPDFJob_config.cc
index ad970aa4..7342aeea 100644
--- a/libqpdf/QPDFJob_config.cc
+++ b/libqpdf/QPDFJob_config.cc
@@ -534,9 +534,7 @@ QPDFJob::CopyAttConfig::end()
 {
     if (this->caf.path.empty())
     {
-        // QXXXQ usage, json, and config exceptions need to be unified
-        // in some fashion.
-        throw std::runtime_error("copy attachments: no path specified");
+        throw QPDFJob::ConfigError("copy attachments: no path specified");
     }
     this->config.o.attachments_to_copy.push_back(this->caf);
     return this->config;
@@ -579,8 +577,7 @@ QPDFJob::AttConfig::creationdate(char const* parameter)
 {
     if (! QUtil::pdf_time_to_qpdf_time(parameter))
     {
-        // QXXXQ
-        throw std::runtime_error(
+        throw QPDFJob::ConfigError(
             std::string(parameter) + " is not a valid PDF timestamp");
     }
     this->att.creationdate = parameter;
@@ -592,8 +589,7 @@ QPDFJob::AttConfig::moddate(char const* parameter)
 {
     if (! QUtil::pdf_time_to_qpdf_time(parameter))
     {
-        // QXXXQ
-        throw std::runtime_error(
+        throw QPDFJob::ConfigError(
             std::string(parameter) + " is not a valid PDF timestamp");
     }
     this->att.moddate = parameter;
@@ -605,8 +601,7 @@ QPDFJob::AttConfig::mimetype(char const* parameter)
 {
     if (strchr(parameter, '/') == nullptr)
     {
-        // QXXXQ
-        throw std::runtime_error(
+        throw QPDFJob::ConfigError(
             "mime type should be specified as type/subtype");
     }
     this->att.mimetype = parameter;
@@ -630,18 +625,17 @@ QPDFJob::AttConfig::replace()
 QPDFJob::Config&
 QPDFJob::AttConfig::end()
 {
-    // QXXXQ runtime_error
-
     static std::string now = QUtil::qpdf_time_to_pdf_time(
         QUtil::get_current_qpdf_time());
     if (this->att.path.empty())
     {
-        throw std::runtime_error("add attachment: no path specified");
+        throw QPDFJob::ConfigError("add attachment: no path specified");
     }
     std::string last_element = QUtil::path_basename(this->att.path);
     if (last_element.empty())
     {
-        throw std::runtime_error("path for --add-attachment may not be empty");
+        throw QPDFJob::ConfigError(
+            "path for --add-attachment may not be empty");
     }
     if (this->att.filename.empty())
     {
-- 
cgit v1.2.3-54-g00ecf