Source Format Enforcement (#763)

[thirdparty/squid.git] / src / DiskIO / AIO / AIODiskFile.h

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index 67d8ea76a60ae1beafb90ce969477a48c96dd5e2..527732e231ed0a3a52c316cf0e0e20acebf222b9 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -1,56 +1,30 @@
 /*
- * $Id$
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
  *
- * 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) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_AIODISKFILE_H
 #define SQUID_AIODISKFILE_H
 
-#include "config.h"
-
-#if USE_DISKIO_AIO
+#if HAVE_DISKIO_MODULE_AIO
 
-#include "DiskIO/DiskFile.h"
-#include "async_io.h"
 #include "cbdata.h"
+#include "DiskIO/AIO/async_io.h"
+#include "DiskIO/DiskFile.h"
+#include "SquidString.h"
 
 class AIODiskIOStrategy;
 
 class AIODiskFile : public DiskFile
 {
+    CBDATA_CLASS(AIODiskFile);
 
 public:
 
     friend class AIODiskIOStrategy;
-    void * operator new (size_t);
-    void operator delete (void *);
     AIODiskFile (char const *path, AIODiskIOStrategy *);
     ~AIODiskFile();
 
@@ -73,7 +47,6 @@ public:
     virtual bool ioInProgress() const;
 
 private:
-    CBDATA_CLASS(AIODiskFile);
     void error(bool const &);
     int fd;
     String path;
@@ -83,5 +56,6 @@ private:
     bool error_;
 };
 
-#endif /* USE_DISKIO_AIO */
+#endif /* HAVE_DISKIO_MODULE_AIO */
 #endif /* SQUID_AIODISKFILE_H */
+