Commit 40e4d1f97cbf5cb58d5324380da415f12d3aaa32

Authored by Jay Berkenbilt
Committed by GitHub
2 parents 5981b25e 9c7aa2cb

Merge pull request #930 from m-holger/throw

Code tidy re-throwing of exceptions
libqpdf/NNTree.cc
@@ -899,7 +899,7 @@ NNTreeImpl::find(QPDFObjectHandle key, bool return_prev_if_not_found) @@ -899,7 +899,7 @@ NNTreeImpl::find(QPDFObjectHandle key, bool return_prev_if_not_found)
899 repair(); 899 repair();
900 return findInternal(key, return_prev_if_not_found); 900 return findInternal(key, return_prev_if_not_found);
901 } else { 901 } else {
902 - throw e; 902 + throw;
903 } 903 }
904 } 904 }
905 } 905 }
libqpdf/QPDF.cc
@@ -500,7 +500,7 @@ QPDF::parse(char const* password) @@ -500,7 +500,7 @@ QPDF::parse(char const* password)
500 reconstruct_xref(e); 500 reconstruct_xref(e);
501 QTC::TC("qpdf", "QPDF reconstructed xref table"); 501 QTC::TC("qpdf", "QPDF reconstructed xref table");
502 } else { 502 } else {
503 - throw e; 503 + throw;
504 } 504 }
505 } 505 }
506 506
@@ -1483,7 +1483,7 @@ QPDF::readObject( @@ -1483,7 +1483,7 @@ QPDF::readObject(
1483 warn(e); 1483 warn(e);
1484 length = recoverStreamLength(input, og, stream_offset); 1484 length = recoverStreamLength(input, og, stream_offset);
1485 } else { 1485 } else {
1486 - throw e; 1486 + throw;
1487 } 1487 }
1488 } 1488 }
1489 object = newIndirect( 1489 object = newIndirect(
@@ -1684,7 +1684,7 @@ QPDF::readObjectAtOffset( @@ -1684,7 +1684,7 @@ QPDF::readObjectAtOffset(
1684 return QPDFObjectHandle::newNull(); 1684 return QPDFObjectHandle::newNull();
1685 } 1685 }
1686 } else { 1686 } else {
1687 - throw e; 1687 + throw;
1688 } 1688 }
1689 } 1689 }
1690 1690
libqpdf/QPDFJob.cc
@@ -469,7 +469,7 @@ QPDFJob::createQPDF() @@ -469,7 +469,7 @@ QPDFJob::createQPDF()
469 return nullptr; 469 return nullptr;
470 } 470 }
471 } 471 }
472 - throw e; 472 + throw;
473 } 473 }
474 QPDF& pdf = *pdf_sp; 474 QPDF& pdf = *pdf_sp;
475 if (pdf.isEncrypted()) { 475 if (pdf.isEncrypted()) {
@@ -1969,11 +1969,11 @@ QPDFJob::doProcess( @@ -1969,11 +1969,11 @@ QPDFJob::doProcess(
1969 try { 1969 try {
1970 doProcessOnce(pdf, fn, *iter, empty, used_for_input, main_input); 1970 doProcessOnce(pdf, fn, *iter, empty, used_for_input, main_input);
1971 return; 1971 return;
1972 - } catch (QPDFExc& e) { 1972 + } catch (QPDFExc&) {
1973 auto next = iter; 1973 auto next = iter;
1974 ++next; 1974 ++next;
1975 if (next == passwords.end()) { 1975 if (next == passwords.end()) {
1976 - throw e; 1976 + throw;
1977 } 1977 }
1978 } 1978 }
1979 if (!warned) { 1979 if (!warned) {