Imported Upstream version 1.67.0upstream/1.67.0

1 files changed, 21 insertions, 31 deletions

diff --git a/tools/quickbook/test/src/text_diff.cpp b/tools/quickbook/test/src/text_diff.cpp
index 1617f9cd52..cee521173b 100644
--- a/tools/quickbook/test/src/text_diff.cpp
+++ b/tools/quickbook/test/src/text_diff.cpp
@@ -6,21 +6,21 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <iterator>
-#include <cstring>
 #include <vector>
 
-#include <boost/spirit/include/classic_scanner.hpp>
 #include <boost/spirit/include/classic_primitives.hpp>
+#include <boost/spirit/include/classic_scanner.hpp>
 
 namespace spirit = boost::spirit::classic;
 
 typedef std::istream_iterator<char, char> iterator;
 typedef spirit::scanner<iterator> scanner;
 
-int main(int argc, char * argv[])
+int main(int argc, char* argv[])
 {
     std::vector<char*> args;
     bool usage_error = false;
@@ -30,17 +30,18 @@ int main(int argc, char * argv[])
             if (strcmp(argv[i], "--strict") == 0) {
                 // Ignore --strict because the build file accidentally
                 // uses it. Why yes, this is a horrible hack.
-            } else {
+            }
+            else {
                 std::cerr << "ERROR: Invalid flag: " << argv[i] << std::endl;
                 usage_error = true;
             }
-        } else {
+        }
+        else {
             args.push_back(argv[i]);
         }
     }
 
-    if (!usage_error && args.size() != 2)
-    {
+    if (!usage_error && args.size() != 2) {
         std::cerr << "ERROR: Wrong number of arguments." << std::endl;
         usage_error = true;
     }
@@ -50,12 +51,10 @@ int main(int argc, char * argv[])
         return 1;
     }
 
-    std::ifstream
-        file1(args[0], std::ios_base::binary | std::ios_base::in),
+    std::ifstream file1(args[0], std::ios_base::binary | std::ios_base::in),
         file2(args[1], std::ios_base::binary | std::ios_base::in);
 
-    if (!file1 || !file2)
-    {
+    if (!file1 || !file2) {
         std::cerr << "ERROR: Unable to open one or both files." << std::endl;
         return 2;
     }
@@ -63,24 +62,17 @@ int main(int argc, char * argv[])
     file1.unsetf(std::ios_base::skipws);
     file2.unsetf(std::ios_base::skipws);
 
-    iterator
-        iter_file1(file1),
-        iter_file2(file2);
+    iterator iter_file1(file1), iter_file2(file2);
 
-    scanner
-        scan1(iter_file1, iterator()),
-        scan2(iter_file2, iterator());
+    scanner scan1(iter_file1, iterator()), scan2(iter_file2, iterator());
 
     std::size_t line = 1, column = 1;
 
-    while (!scan1.at_end() && !scan2.at_end())
-    {
-        if (spirit::eol_p.parse(scan1))
-        {
-            if (!spirit::eol_p.parse(scan2))
-            {
-                std::cout << "Files differ at line " << line << ", column " <<
-                    column << '.' << std::endl;
+    while (!scan1.at_end() && !scan2.at_end()) {
+        if (spirit::eol_p.parse(scan1)) {
+            if (!spirit::eol_p.parse(scan2)) {
+                std::cout << "Files differ at line " << line << ", column "
+                          << column << '.' << std::endl;
                 return 3;
             }
 
@@ -88,18 +80,16 @@ int main(int argc, char * argv[])
             continue;
         }
 
-        if (*scan1 != *scan2)
-        {
-            std::cout << "Files differ at line " << line << ", column " <<
-                column << '.' << std::endl;
+        if (*scan1 != *scan2) {
+            std::cout << "Files differ at line " << line << ", column "
+                      << column << '.' << std::endl;
             return 4;
         }
 
         ++scan1, ++scan2, ++column;
     }
 
-    if (scan1.at_end() != scan2.at_end())
-    {
+    if (scan1.at_end() != scan2.at_end()) {
         std::cout << "Files differ in length." << std::endl;
         return 5;
     }