Commit ceeb25f3c8c3a7052d9c77619e96e64316b60897

Authored by Jay Berkenbilt
1 parent df3d3d23

Rename --report-mem-usage to --report-memory-usage

Avd xcsv brvtns.
include/qpdf/auto_job_c_main.hh
@@ -33,7 +33,7 @@ QPDF_DLL Config* qdf(); @@ -33,7 +33,7 @@ QPDF_DLL Config* qdf();
33 QPDF_DLL Config* rawStreamData(); 33 QPDF_DLL Config* rawStreamData();
34 QPDF_DLL Config* recompressFlate(); 34 QPDF_DLL Config* recompressFlate();
35 QPDF_DLL Config* removePageLabels(); 35 QPDF_DLL Config* removePageLabels();
36 -QPDF_DLL Config* reportMemUsage(); 36 +QPDF_DLL Config* reportMemoryUsage();
37 QPDF_DLL Config* requiresPassword(); 37 QPDF_DLL Config* requiresPassword();
38 QPDF_DLL Config* showEncryption(); 38 QPDF_DLL Config* showEncryption();
39 QPDF_DLL Config* showEncryptionKey(); 39 QPDF_DLL Config* showEncryptionKey();
job.sums
@@ -3,15 +3,15 @@ generate_auto_job 9abe2ec994fb98526f5e3c0c199ce2e61a868463cb522a5bc6e9730b655341 @@ -3,15 +3,15 @@ generate_auto_job 9abe2ec994fb98526f5e3c0c199ce2e61a868463cb522a5bc6e9730b655341
3 include/qpdf/auto_job_c_att.hh 4c2b171ea00531db54720bf49a43f8b34481586ae7fb6cbf225099ee42bc5bb4 3 include/qpdf/auto_job_c_att.hh 4c2b171ea00531db54720bf49a43f8b34481586ae7fb6cbf225099ee42bc5bb4
4 include/qpdf/auto_job_c_copy_att.hh 50609012bff14fd82f0649185940d617d05d530cdc522185c7f3920a561ccb42 4 include/qpdf/auto_job_c_copy_att.hh 50609012bff14fd82f0649185940d617d05d530cdc522185c7f3920a561ccb42
5 include/qpdf/auto_job_c_enc.hh 28446f3c32153a52afa239ea40503e6cc8ac2c026813526a349e0cd4ae17ddd5 5 include/qpdf/auto_job_c_enc.hh 28446f3c32153a52afa239ea40503e6cc8ac2c026813526a349e0cd4ae17ddd5
6 -include/qpdf/auto_job_c_main.hh 493b9798f5ff8bbcb07c0238693554d77eefa4ae71ce1a0d466de94e3a7a3966 6 +include/qpdf/auto_job_c_main.hh a591693e831d08155da78cbbb13bac46cc3f5dd04de1d10b5810cbd3491bf8a0
7 include/qpdf/auto_job_c_pages.hh b3cc0f21029f6d89efa043dcdbfa183cb59325b6506001c18911614fe8e568ec 7 include/qpdf/auto_job_c_pages.hh b3cc0f21029f6d89efa043dcdbfa183cb59325b6506001c18911614fe8e568ec
8 include/qpdf/auto_job_c_uo.hh ae21b69a1efa9333050f4833d465f6daff87e5b38e5106e49bbef5d4132e4ed1 8 include/qpdf/auto_job_c_uo.hh ae21b69a1efa9333050f4833d465f6daff87e5b38e5106e49bbef5d4132e4ed1
9 -job.yml a6f22d425980ed960c77c0a4197f46924c14e7943358cd9f0b75811bb1c480ad 9 +job.yml 70a670b843284707c54108382cc17ab5c633aacc9a264bc0886a5410bea040e3
10 libqpdf/qpdf/auto_job_decl.hh 7844eba58edffb9494b19e8eca6fd59a24d6e152ca606c3b07da569f753df2da 10 libqpdf/qpdf/auto_job_decl.hh 7844eba58edffb9494b19e8eca6fd59a24d6e152ca606c3b07da569f753df2da
11 -libqpdf/qpdf/auto_job_help.hh 3e9385a7e0dae993467647466fa30f30baa5968f9270c73ff4e664f5aa415dbe  
12 -libqpdf/qpdf/auto_job_init.hh ccb881733849dff5c05721f1aa5c35447cedd415e881c3fef6573901e45be056 11 +libqpdf/qpdf/auto_job_help.hh 68bcc56ae2b1a63d47af60f817c39f097756b6d36c733c8efdfbb808bce750c9
  12 +libqpdf/qpdf/auto_job_init.hh da9b10925f3527acdc7cd0217abd2684a721a562f16f2fc0da62339aef3c3629
13 libqpdf/qpdf/auto_job_json_decl.hh 06caa46eaf71db8a50c046f91866baa8087745a9474319fb7c86d92634cc8297 13 libqpdf/qpdf/auto_job_json_decl.hh 06caa46eaf71db8a50c046f91866baa8087745a9474319fb7c86d92634cc8297
14 -libqpdf/qpdf/auto_job_json_init.hh 7ac8f42fb39eda56144ab62b30152a56e9bb2224d0596eb826b7bc421a78d26b  
15 -libqpdf/qpdf/auto_job_schema.hh 17352791b09c3b8a8db766375cce31d70c98b67b44ecc398e2ac78984e34fe90 14 +libqpdf/qpdf/auto_job_json_init.hh 8eec1d4acdf3e40cea46155cbf23a60d226ae6e9493ab18265b95dca790ed66d
  15 +libqpdf/qpdf/auto_job_schema.hh a960022725ac4a59db531a3e2bc3964e40113b47348864e9229eb0f3fecfbdc0
16 manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580 16 manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580
17 -manual/cli.rst e3fa48bb30c981df1f74d474887155cd6a46f9010b91cd1b7b57e582bf3bf877 17 +manual/cli.rst 861e3c18c5f17886b715f36ed3ad65fb7b1ccfbe17649dbebb8bd0e228f92aa3
@@ -127,7 +127,7 @@ options: @@ -127,7 +127,7 @@ options:
127 - recompress-flate 127 - recompress-flate
128 - remove-page-labels 128 - remove-page-labels
129 - replace-input 129 - replace-input
130 - - report-mem-usage 130 + - report-memory-usage
131 - requires-password 131 - requires-password
132 - show-encryption 132 - show-encryption
133 - show-encryption-key 133 - show-encryption-key
@@ -414,7 +414,7 @@ json: @@ -414,7 +414,7 @@ json:
414 Pages.password: 414 Pages.password:
415 _range: "page range" 415 _range: "page range"
416 remove-page-labels: 416 remove-page-labels:
417 - report-mem-usage: 417 + report-memory-usage:
418 rotate: 418 rotate:
419 overlay: 419 overlay:
420 _file: "source file for overlay" 420 _file: "source file for overlay"
libqpdf/QPDFJob_config.cc
@@ -503,7 +503,7 @@ QPDFJob::Config::removePageLabels() @@ -503,7 +503,7 @@ QPDFJob::Config::removePageLabels()
503 } 503 }
504 504
505 QPDFJob::Config* 505 QPDFJob::Config*
506 -QPDFJob::Config::reportMemUsage() 506 +QPDFJob::Config::reportMemoryUsage()
507 { 507 {
508 o.m->report_mem_usage = true; 508 o.m->report_mem_usage = true;
509 return this; 509 return this;
libqpdf/qpdf/auto_job_help.hh
@@ -883,7 +883,7 @@ for debugging qpdf. @@ -883,7 +883,7 @@ for debugging qpdf.
883 ap.addOptionHelp("--test-json-schema", "testing", "test generated json against schema", R"(This is used by qpdf's test suite to check consistency between 883 ap.addOptionHelp("--test-json-schema", "testing", "test generated json against schema", R"(This is used by qpdf's test suite to check consistency between
884 the output of qpdf --json and the output of qpdf --json-help. 884 the output of qpdf --json and the output of qpdf --json-help.
885 )"); 885 )");
886 -ap.addOptionHelp("--report-mem-usage", "testing", "best effort report of memory usage", R"(This is used by qpdf's performance test suite to report the 886 +ap.addOptionHelp("--report-memory-usage", "testing", "best effort report of memory usage", R"(This is used by qpdf's performance test suite to report the
887 maximum amount of memory used in supported environments. 887 maximum amount of memory used in supported environments.
888 )"); 888 )");
889 } 889 }
libqpdf/qpdf/auto_job_init.hh
@@ -69,7 +69,7 @@ this->ap.addBare("raw-stream-data", [this](){c_main->rawStreamData();}); @@ -69,7 +69,7 @@ this->ap.addBare("raw-stream-data", [this](){c_main->rawStreamData();});
69 this->ap.addBare("recompress-flate", [this](){c_main->recompressFlate();}); 69 this->ap.addBare("recompress-flate", [this](){c_main->recompressFlate();});
70 this->ap.addBare("remove-page-labels", [this](){c_main->removePageLabels();}); 70 this->ap.addBare("remove-page-labels", [this](){c_main->removePageLabels();});
71 this->ap.addBare("replace-input", b(&ArgParser::argReplaceInput)); 71 this->ap.addBare("replace-input", b(&ArgParser::argReplaceInput));
72 -this->ap.addBare("report-mem-usage", [this](){c_main->reportMemUsage();}); 72 +this->ap.addBare("report-memory-usage", [this](){c_main->reportMemoryUsage();});
73 this->ap.addBare("requires-password", [this](){c_main->requiresPassword();}); 73 this->ap.addBare("requires-password", [this](){c_main->requiresPassword();});
74 this->ap.addBare("show-encryption", [this](){c_main->showEncryption();}); 74 this->ap.addBare("show-encryption", [this](){c_main->showEncryption();});
75 this->ap.addBare("show-encryption-key", [this](){c_main->showEncryptionKey();}); 75 this->ap.addBare("show-encryption-key", [this](){c_main->showEncryptionKey();});
libqpdf/qpdf/auto_job_json_init.hh
@@ -409,9 +409,9 @@ popHandler(); // key: pages @@ -409,9 +409,9 @@ popHandler(); // key: pages
409 pushKey("removePageLabels"); 409 pushKey("removePageLabels");
410 addBare([this]() { c_main->removePageLabels(); }); 410 addBare([this]() { c_main->removePageLabels(); });
411 popHandler(); // key: removePageLabels 411 popHandler(); // key: removePageLabels
412 -pushKey("reportMemUsage");  
413 -addBare([this]() { c_main->reportMemUsage(); });  
414 -popHandler(); // key: reportMemUsage 412 +pushKey("reportMemoryUsage");
  413 +addBare([this]() { c_main->reportMemoryUsage(); });
  414 +popHandler(); // key: reportMemoryUsage
415 pushKey("rotate"); 415 pushKey("rotate");
416 addParameter([this](std::string const& p) { c_main->rotate(p); }); 416 addParameter([this](std::string const& p) { c_main->rotate(p); });
417 popHandler(); // key: rotate 417 popHandler(); // key: rotate
libqpdf/qpdf/auto_job_schema.hh
@@ -144,7 +144,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ @@ -144,7 +144,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({
144 } 144 }
145 ], 145 ],
146 "removePageLabels": "remove explicit page numbers", 146 "removePageLabels": "remove explicit page numbers",
147 - "reportMemUsage": "best effort report of memory usage", 147 + "reportMemoryUsage": "best effort report of memory usage",
148 "rotate": "rotate pages", 148 "rotate": "rotate pages",
149 "overlay": { 149 "overlay": {
150 "file": "source file for overlay", 150 "file": "source file for overlay",
manual/cli.rst
@@ -3463,7 +3463,7 @@ Related Options @@ -3463,7 +3463,7 @@ Related Options
3463 memory and is therefore unsuitable for use with large files. This 3463 memory and is therefore unsuitable for use with large files. This
3464 is why it's also not on by default. 3464 is why it's also not on by default.
3465 3465
3466 -.. qpdf:option:: --report-mem-usage 3466 +.. qpdf:option:: --report-memory-usage
3467 3467
3468 .. help: best effort report of memory usage 3468 .. help: best effort report of memory usage
3469 3469