From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Tue, 1 Aug 2017 22:53:15 +0000 (-0700)
Subject: Cut debugging code from SocketAddress
X-Git-Tag: v2017.08.07.00~10
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6065a18c28db86989cc6a014163f82c76201ee87;p=folly.git

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
---

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<char*>(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;
     }
   };