Programmatically apply new formatting to code

Run this:

for i in  **/*.cc **/*.c **/*.h **/*.hh; do
  clang-format < $i >| $i.new && mv $i.new $i
done

10 files changed, 79 insertions, 102 deletions

diff --git a/fuzz/ascii85_fuzzer.cc b/fuzz/ascii85_fuzzer.cc
index 40422e5b..daf6628c 100644
--- a/fuzz/ascii85_fuzzer.cc
+++ b/fuzz/ascii85_fuzzer.cc
@@ -1,5 +1,5 @@
-#include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_ASCII85Decoder.hh>
+#include <qpdf/Pl_Discard.hh>
 #include <iostream>
 #include <stdexcept>
 
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/dct_fuzzer.cc b/fuzz/dct_fuzzer.cc
index b051819a..6e42ef6d 100644
--- a/fuzz/dct_fuzzer.cc
+++ b/fuzz/dct_fuzzer.cc
@@ -1,8 +1,8 @@
-#include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_DCT.hh>
+#include <qpdf/Pl_Discard.hh>
+#include <cstdlib>
 #include <iostream>
 #include <stdexcept>
-#include <cstdlib>
 
 class FuzzHelper
 {
@@ -35,17 +35,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
 #ifndef _WIN32
     // Used by jpeg library to work around false positives in memory
diff --git a/fuzz/flate_fuzzer.cc b/fuzz/flate_fuzzer.cc
index 700f7cd7..97e10dd2 100644
--- a/fuzz/flate_fuzzer.cc
+++ b/fuzz/flate_fuzzer.cc
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/hex_fuzzer.cc b/fuzz/hex_fuzzer.cc
index b1ad2199..0ce7b2e0 100644
--- a/fuzz/hex_fuzzer.cc
+++ b/fuzz/hex_fuzzer.cc
@@ -1,5 +1,5 @@
-#include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_ASCIIHexDecoder.hh>
+#include <qpdf/Pl_Discard.hh>
 #include <iostream>
 #include <stdexcept>
 
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/lzw_fuzzer.cc b/fuzz/lzw_fuzzer.cc
index da31f41b..5e017507 100644
--- a/fuzz/lzw_fuzzer.cc
+++ b/fuzz/lzw_fuzzer.cc
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/pngpredictor_fuzzer.cc b/fuzz/pngpredictor_fuzzer.cc
index 8a8c5d7d..7a39c8ec 100644
--- a/fuzz/pngpredictor_fuzzer.cc
+++ b/fuzz/pngpredictor_fuzzer.cc
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/qpdf_fuzzer.cc b/fuzz/qpdf_fuzzer.cc
index 9f0d5d39..3c76bbc9 100644
--- a/fuzz/qpdf_fuzzer.cc
+++ b/fuzz/qpdf_fuzzer.cc
@@ -1,22 +1,30 @@
-#include <qpdf/QPDF.hh>
-#include <qpdf/QPDFWriter.hh>
-#include <qpdf/QUtil.hh>
-#include <qpdf/BufferInputSource.hh>
 #include <qpdf/Buffer.hh>
+#include <qpdf/BufferInputSource.hh>
 #include <qpdf/Pl_Discard.hh>
+#include <qpdf/QPDF.hh>
+#include <qpdf/QPDFAcroFormDocumentHelper.hh>
+#include <qpdf/QPDFOutlineDocumentHelper.hh>
 #include <qpdf/QPDFPageDocumentHelper.hh>
-#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFPageLabelDocumentHelper.hh>
-#include <qpdf/QPDFOutlineDocumentHelper.hh>
-#include <qpdf/QPDFAcroFormDocumentHelper.hh>
+#include <qpdf/QPDFPageObjectHelper.hh>
+#include <qpdf/QPDFWriter.hh>
+#include <qpdf/QUtil.hh>
 #include <cstdlib>
 
 class DiscardContents: public QPDFObjectHandle::ParserCallbacks
 {
   public:
-    virtual ~DiscardContents() {}
-    virtual void handleObject(QPDFObjectHandle) {}
-    virtual void handleEOF() {}
+    virtual ~DiscardContents()
+    {
+    }
+    virtual void
+    handleObject(QPDFObjectHandle)
+    {
+    }
+    virtual void
+    handleEOF()
+    {
+    }
 };
 
 class FuzzHelper
@@ -66,16 +74,11 @@ FuzzHelper::getWriter(PointerHolder<QPDF> qpdf)
 void
 FuzzHelper::doWrite(PointerHolder<QPDFWriter> w)
 {
-    try
-    {
+    try {
         w->write();
-    }
-    catch (QPDFExc const& e)
-    {
+    } catch (QPDFExc const& e) {
         std::cerr << e.what() << std::endl;
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << e.what() << std::endl;
     }
 }
@@ -133,14 +136,12 @@ FuzzHelper::testPages()
     std::vector<QPDFPageObjectHelper> pages = pdh.getAllPages();
     DiscardContents discard_contents;
     int pageno = 0;
-    for (std::vector<QPDFPageObjectHelper>::iterator iter =
-             pages.begin();
-         iter != pages.end(); ++iter)
-    {
+    for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin();
+         iter != pages.end();
+         ++iter) {
         QPDFPageObjectHelper& page(*iter);
         ++pageno;
-        try
-        {
+        try {
             page.coalesceContentStreams();
             page.parseContents(&discard_contents);
             page.getImages();
@@ -153,16 +154,13 @@ FuzzHelper::testPages()
                 afdh.getWidgetAnnotationsForPage(page);
             for (std::vector<QPDFAnnotationObjectHelper>::iterator annot_iter =
                      annotations.begin();
-                 annot_iter != annotations.end(); ++annot_iter)
-            {
+                 annot_iter != annotations.end();
+                 ++annot_iter) {
                 QPDFAnnotationObjectHelper& aoh = *annot_iter;
                 afdh.getFieldForAnnotation(aoh);
             }
-        }
-        catch (QPDFExc& e)
-        {
-            std::cerr << "page " << pageno << ": "
-                      << e.what() << std::endl;
+        } catch (QPDFExc& e) {
+            std::cerr << "page " << pageno << ": " << e.what() << std::endl;
         }
     }
 }
@@ -171,16 +169,15 @@ void
 FuzzHelper::testOutlines()
 {
     PointerHolder<QPDF> q = getQpdf();
-    std::list<std::vector<QPDFOutlineObjectHelper> > queue;
+    std::list<std::vector<QPDFOutlineObjectHelper>> queue;
     QPDFOutlineDocumentHelper odh(*q);
     queue.push_back(odh.getTopLevelOutlines());
-    while (! queue.empty())
-    {
+    while (!queue.empty()) {
         std::vector<QPDFOutlineObjectHelper>& outlines = *(queue.begin());
         for (std::vector<QPDFOutlineObjectHelper>::iterator iter =
                  outlines.begin();
-             iter != outlines.end(); ++iter)
-        {
+             iter != outlines.end();
+             ++iter) {
             QPDFOutlineObjectHelper& ol = *iter;
             ol.getDestPage();
             queue.push_back(ol.getKids());
@@ -208,21 +205,17 @@ FuzzHelper::run()
     // std::runtime_error. Throwing any other kind of exception,
     // segfaulting, or having a memory error (when built with
     // appropriate sanitizers) will all cause abnormal exit.
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (QPDFExc const& e)
-    {
+    } catch (QPDFExc const& e) {
         std::cerr << "QPDFExc: " << e.what() << std::endl;
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
 #ifndef _WIN32
     // Used by jpeg library to work around false positives in memory
diff --git a/fuzz/runlength_fuzzer.cc b/fuzz/runlength_fuzzer.cc
index bacd3dd8..3ff3f587 100644
--- a/fuzz/runlength_fuzzer.cc
+++ b/fuzz/runlength_fuzzer.cc
@@ -34,17 +34,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();
diff --git a/fuzz/standalone_fuzz_target_runner.cc b/fuzz/standalone_fuzz_target_runner.cc
index 65905c14..066764a2 100644
--- a/fuzz/standalone_fuzz_target_runner.cc
+++ b/fuzz/standalone_fuzz_target_runner.cc
@@ -4,10 +4,10 @@
 
 extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size);
 
-int main(int argc, char **argv)
+int
+main(int argc, char** argv)
 {
-    for (int i = 1; i < argc; i++)
-    {
+    for (int i = 1; i < argc; i++) {
         PointerHolder<char> file_buf;
         size_t size = 0;
         QUtil::read_file_into_memory(argv[i], file_buf, size);
diff --git a/fuzz/tiffpredictor_fuzzer.cc b/fuzz/tiffpredictor_fuzzer.cc
index 35d2f415..61c24e57 100644
--- a/fuzz/tiffpredictor_fuzzer.cc
+++ b/fuzz/tiffpredictor_fuzzer.cc
@@ -26,8 +26,8 @@ void
 FuzzHelper::doChecks()
 {
     Pl_Discard discard;
-    Pl_TIFFPredictor p("decoder", &discard,
-                       Pl_TIFFPredictor::a_decode, 16, 1, 8);
+    Pl_TIFFPredictor p(
+        "decoder", &discard, Pl_TIFFPredictor::a_decode, 16, 1, 8);
     p.write(const_cast<unsigned char*>(data), size);
     p.finish();
 }
@@ -35,17 +35,15 @@ FuzzHelper::doChecks()
 void
 FuzzHelper::run()
 {
-    try
-    {
+    try {
         doChecks();
-    }
-    catch (std::runtime_error const& e)
-    {
+    } catch (std::runtime_error const& e) {
         std::cerr << "runtime_error: " << e.what() << std::endl;
     }
 }
 
-extern "C" int LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
+extern "C" int
+LLVMFuzzerTestOneInput(unsigned char const* data, size_t size)
 {
     FuzzHelper f(data, size);
     f.run();