X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fbyteorder.cc;h=d20b37ef4a0697681f63dcbb166f2ba4c9cf20a8;hb=ae093bfbe9693e50a368e29048d83c2f8f8422e7;hp=c3867a5afe01cc83bae5674ccb76b7201dff7498;hpb=24e6e50be3f7f402c59c7bab5d02657a29e752cb;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/byteorder.cc b/src/libmemcached/byteorder.cc
index c3867a5a..d20b37ef 100644
--- a/src/libmemcached/byteorder.cc
+++ b/src/libmemcached/byteorder.cc
@@ -1,72 +1,50 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Libmemcached library
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  Copyright (C) 2006-2009 Brian Aker All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
+    +--------------------------------------------------------------------+
+*/
 
 #include "mem_config.h"
+
+#if HAVE_HTONLL && HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+#endif
+
 #include "libmemcached/byteorder.h"
 
 /* Byte swap a 64-bit number. */
 #ifndef swap64
-# ifndef HAVE_HTONLL
-static inline uint64_t swap64(uint64_t in)
-{
-#if !WORDS_BIGENDIAN
+#  ifndef HAVE_HTONLL
+static inline uint64_t swap64(uint64_t in) {
+#    if !WORDS_BIGENDIAN
   /* Little endian, flip the bytes around until someone makes a faster/better
    * way to do this. */
-  uint64_t rv= 0;
-  for (uint8_t x= 0; x < 8; ++x)
-  {
-    rv= (rv << 8) | (in & 0xff);
+  uint64_t rv = 0;
+  for (uint8_t x = 0; x < 8; ++x) {
+    rv = (rv << 8) | (in & 0xff);
     in >>= 8;
   }
   return rv;
-#else
+#    else
   /* big-endian machines don't need byte swapping */
   return in;
-#endif // WORDS_BIGENDIAN
+#    endif // WORDS_BIGENDIAN
 }
-# endif
+#  endif
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
-uint64_t memcached_ntohll(uint64_t value)
-{
+uint64_t memcached_ntohll(uint64_t value) {
 #ifdef HAVE_HTONLL
   return ntohll(value);
 #else
@@ -74,8 +52,7 @@ uint64_t memcached_ntohll(uint64_t value)
 #endif
 }
 
-uint64_t memcached_htonll(uint64_t value)
-{
+uint64_t memcached_htonll(uint64_t value) {
 #ifdef HAVE_HTONLL
   return htonll(value);
 #else