Fixed sha1/sockaddr_deleter.

Author: rakshasa

src/torrent/net/types.h

@@ -15,12 +15,10 @@ namespace torrent {
 void sa_free(const sockaddr* sa) LIBTORRENT_EXPORT;
 
 struct sockaddr_deleter {
-  void operator()(const sockaddr* sa) {
-    if (sa == nullptr)
-      return;
+  constexpr sockaddr_deleter() noexcept = default;
 
-    sa_free(sa);
-  }
+  // void operator()(sockaddr* sa) const       { sa_free(sa); }
+  void operator()(const sockaddr* sa) const { sa_free(sa); }
 };
 
 using sa_unique_ptr   = std::unique_ptr<sockaddr, sockaddr_deleter>;

src/utils/sha1.h

@@ -1,56 +1,16 @@
-// libTorrent - BitTorrent library
-// Copyright (C) 2005-2011, Jari Sundell
-//
-// 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-1307  USA
-//
-// In addition, as a special exception, the copyright holders give
-// permission to link the code of portions of this program with the
-// OpenSSL library under certain conditions as described in each
-// individual source file, and distribute linked combinations
-// including the two.
-//
-// You must obey the GNU General Public License in all respects for
-// all of the code used other than OpenSSL.  If you modify file(s)
-// with this exception, you may extend this exception to your version
-// of the file(s), but you are not obligated to do so.  If you do not
-// wish to do so, delete this exception statement from your version.
-// If you delete this exception statement from all source files in the
-// program, then also delete it here.
-//
-// Contact:  Jari Sundell <jaris@ifi.uio.no>
-//
-//           Skomakerveien 33
-//           3185 Skoppum, NORWAY
-
 #ifndef LIBTORRENT_HASH_COMPUTE_H
 #define LIBTORRENT_HASH_COMPUTE_H
 
 #include <cstring>
 #include <memory>
-
 #include <openssl/evp.h>
 
 namespace torrent {
 
 struct sha1_deleter {
-  void operator()(EVP_MD_CTX* ctx) {
-    if (ctx == nullptr)
-      return;
+  constexpr sha1_deleter() noexcept = default;
 
-    EVP_MD_CTX_free(ctx);
-  }
+  void operator()(const EVP_MD_CTX* ctx) const { EVP_MD_CTX_free(const_cast<EVP_MD_CTX*>(ctx)); }
 };
 
 class Sha1 {