From 6065a18c28db86989cc6a014163f82c76201ee87 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Tue, 1 Aug 2017 15:53:15 -0700 Subject: [PATCH 1/1] Cut debugging code from SocketAddress Summary: [Folly] Cut debugging code from `SocketAddress`. Specifically from its `ExternalUnixAddr` helper class, which is probably not broken. Reviewed By: simpkins Differential Revision: D5530685 fbshipit-source-id: adfc46ec1c1a142e9914051e8a97b39f41d71630 --- folly/SocketAddress.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/folly/SocketAddress.h b/folly/SocketAddress.h index 54fc6a36..06c69883 100644 --- a/folly/SocketAddress.h +++ b/folly/SocketAddress.h @@ -543,38 +543,26 @@ class SocketAddress { struct sockaddr_un *addr; socklen_t len; - /* For debugging only, will be removed */ - uint64_t magic; - static constexpr uint64_t kMagic = 0x1234faceb00c; - socklen_t pathLength() const { return socklen_t(len - offsetof(struct sockaddr_un, sun_path)); } void init() { - addr = new sockaddr_un; - magic = kMagic; + addr = new struct sockaddr_un; addr->sun_family = AF_UNIX; len = 0; } void init(const ExternalUnixAddr &other) { - addr = new sockaddr_un; - magic = kMagic; + addr = new struct sockaddr_un; len = other.len; memcpy(addr, other.addr, size_t(len)); - // Fill the rest with 0s, just for safety - memset(reinterpret_cast(addr) + len, 0, - sizeof(struct sockaddr_un) - len); } void copy(const ExternalUnixAddr &other) { - CHECK(magic == kMagic); len = other.len; memcpy(addr, other.addr, size_t(len)); } void free() { - CHECK(magic == kMagic); delete addr; - magic = 0; } }; -- 2.34.1