Source Format Enforcement (#532)

[thirdparty/squid.git] / src / ufsdump.cc

diff --git a/src/ufsdump.cc b/src/ufsdump.cc
index c5fd2a1e213d694476555664c583488d0e4b89b7..bbacc9f25dcdfd91cf213cce25b5843049c84e47 100644 (file)
--- a/src/ufsdump.cc
+++ b/src/ufsdump.cc
@@ -1,55 +1,28 @@
 /*
- * DEBUG: section 00    UFS Store Dump Tool
- * AUTHOR: Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 00    UFS Store Dump Tool */
+
 #include "squid.h"
-#include "StoreMeta.h"
-#include "StoreMetaUnpacker.h"
-#include "Store.h"
-#include "store_key_md5.h"
 #include "Generic.h"
+#include "md5.h"
 #include "mgr/Registration.h"
+#include "Store.h"
+#include "store_key_md5.h"
+#include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 #undef malloc
 #undef free
 
-#if HAVE_STDEXCEPT
-#include <stdexcept>
-#endif
-#if HAVE_IOSTREAM
-#include <iostream>
-#endif
-#if HAVE_CASSERT
 #include <cassert>
-#endif
+#include <iostream>
+#include <stdexcept>
 
 /* stub functions for parts of squid not factored to be dynamic yet */
 void
@@ -79,14 +52,14 @@ void
 death(int sig)
 {
     std::cout << "Fatal: Signal " <<  sig;
-    exit(1);
+    exit(EXIT_FAILURE);
 }
 
 void
 fatal(const char *message)
 {
     fprintf(stderr, "FATAL: %s\n", message);
-    exit(1);
+    exit(EXIT_FAILURE);
 }
 
 /* end stub functions */
@@ -188,9 +161,8 @@ main(int argc, char *argv[])
 
         for_each(*metadata, dumper);
 
-        return 0;
-    } catch (std::runtime_error error) {
-        std::cout << "Failed : " << error.what() << std::endl;
+    } catch (const std::exception &e) {
+        std::cout << "Failed : " << e.what() << std::endl;
 
         if (fd >= 0)
             close(fd);
@@ -198,6 +170,9 @@ main(int argc, char *argv[])
         if (metadata)
             StoreMeta::FreeList(&metadata);
 
-        return 1;
+        return EXIT_FAILURE;
     }
+
+    return EXIT_SUCCESS;
 }
+