diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-01-31 13:34:40 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-01-31 21:57:45 +0100 |
commit | 81b6314cb513f3e48c788722b9b024bf7c47a601 (patch) | |
tree | 82995960fac0f2f6da34a43850cb0037c9ed7c61 /libqpdf/qpdf/auto_job_json_decl.hh | |
parent | f99e0af49c969529f36f287e23d4e178c40e8c4a (diff) | |
download | qpdf-81b6314cb513f3e48c788722b9b024bf7c47a601.tar.zst |
QPDFJob: fix logic errors in handling arrays
The code was assuming everything was happening inside dictionaries.
Instead, make the dictionary key handler creatino explicit only when
iterating through dictionary keys.
Diffstat (limited to 'libqpdf/qpdf/auto_job_json_decl.hh')
-rw-r--r-- | libqpdf/qpdf/auto_job_json_decl.hh | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/libqpdf/qpdf/auto_job_json_decl.hh b/libqpdf/qpdf/auto_job_json_decl.hh index aa9b8137..8dc37adf 100644 --- a/libqpdf/qpdf/auto_job_json_decl.hh +++ b/libqpdf/qpdf/auto_job_json_decl.hh @@ -5,19 +5,19 @@ // void beginInput(JSON); void endInput(); -void setupInputFilename(std::string const&); -void setupInputPassword(std::string const&); -void setupInputEmpty(std::string const&); +void setupInputFilename(); +void setupInputPassword(); +void setupInputEmpty(); void beginOutput(JSON); void endOutput(); -void setupOutputFilename(std::string const&); -void setupOutputReplaceInput(std::string const&); +void setupOutputFilename(); +void setupOutputReplaceInput(); void beginOutputOptions(JSON); void endOutputOptions(); void beginOutputOptionsEncrypt(JSON); void endOutputOptionsEncrypt(); -void setupOutputOptionsEncryptUserPassword(std::string const&); -void setupOutputOptionsEncryptOwnerPassword(std::string const&); +void setupOutputOptionsEncryptUserPassword(); +void setupOutputOptionsEncryptOwnerPassword(); void beginOutputOptionsEncrypt40bit(JSON); void endOutputOptionsEncrypt40bit(); void beginOutputOptionsEncrypt128bit(JSON); @@ -26,31 +26,35 @@ void beginOutputOptionsEncrypt256bit(JSON); void endOutputOptionsEncrypt256bit(); void beginInspect(JSON); void endInspect(); +void beginInspectJsonKeyArray(JSON); +void endInspectJsonKeyArray(); +void beginInspectJsonObjectArray(JSON); +void endInspectJsonObjectArray(); void beginOptions(JSON); void endOptions(); void beginOptionsAddAttachmentArray(JSON); void endOptionsAddAttachmentArray(); void beginOptionsAddAttachment(JSON); void endOptionsAddAttachment(); -void setupOptionsAddAttachmentPath(std::string const&); +void setupOptionsAddAttachmentPath(); void beginOptionsCopyAttachmentsFromArray(JSON); void endOptionsCopyAttachmentsFromArray(); void beginOptionsCopyAttachmentsFrom(JSON); void endOptionsCopyAttachmentsFrom(); -void setupOptionsCopyAttachmentsFromPath(std::string const&); -void setupOptionsCopyAttachmentsFromPassword(std::string const&); +void setupOptionsCopyAttachmentsFromPath(); +void setupOptionsCopyAttachmentsFromPassword(); void beginOptionsPagesArray(JSON); void endOptionsPagesArray(); void beginOptionsPages(JSON); void endOptionsPages(); -void setupOptionsPagesFile(std::string const&); -void setupOptionsPagesPassword(std::string const&); -void setupOptionsPagesRange(std::string const&); +void setupOptionsPagesFile(); +void setupOptionsPagesPassword(); +void setupOptionsPagesRange(); void beginOptionsOverlay(JSON); void endOptionsOverlay(); -void setupOptionsOverlayFile(std::string const&); -void setupOptionsOverlayPassword(std::string const&); +void setupOptionsOverlayFile(); +void setupOptionsOverlayPassword(); void beginOptionsUnderlay(JSON); void endOptionsUnderlay(); -void setupOptionsUnderlayFile(std::string const&); -void setupOptionsUnderlayPassword(std::string const&); +void setupOptionsUnderlayFile(); +void setupOptionsUnderlayPassword(); |