Bug 1109592 - Cleanup unused variables and fields from NFC's IPC code. r=allstars.chh
authorThomas Zimmermann <tdz@users.sourceforge.net>
Fri, 06 Mar 2015 05:54:00 -0500
changeset 233512 b3e6ad2b1d4bb4a5930460dc4eabc95b5d8aee84
parent 233511 e0c5c9fea6bb63b0a01bc9c5aaa4c2cebf274df8
child 233513 56c4b8d7f286705efe3d8bedb61accdd4625dc95
push id28414
push userryanvm@gmail.com
push dateFri, 13 Mar 2015 16:15:53 +0000
treeherdermozilla-central@1722c4635fac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersallstars.chh
bugs1109592
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1109592 - Cleanup unused variables and fields from NFC's IPC code. r=allstars.chh
ipc/nfc/Nfc.cpp
ipc/nfc/Nfc.h
--- a/ipc/nfc/Nfc.cpp
+++ b/ipc/nfc/Nfc.cpp
@@ -23,22 +23,16 @@
 #include "jsfriendapi.h"
 #include "mozilla/ArrayUtils.h"
 #include "nsThreadUtils.h" // For NS_IsMainThread.
 
 using namespace mozilla::ipc;
 
 namespace {
 
-static const char NFC_SOCKET_NAME[] = "/dev/socket/nfcd";
-
-// Network port to connect to for adb forwarded sockets when doing
-// desktop development.
-static const uint32_t NFC_TEST_PORT = 6400;
-
 class SendNfcSocketDataTask MOZ_FINAL : public nsRunnable
 {
 public:
   SendNfcSocketDataTask(NfcConsumer* aConsumer, UnixSocketRawData* aRawData)
     : mConsumer(aConsumer)
     , mRawData(aRawData)
   { }
 
@@ -167,27 +161,23 @@ NfcListenSocket::OnDisconnect()
 }
 
 //
 // NfcConsumer
 //
 
 NfcConsumer::NfcConsumer(NfcSocketListener* aListener)
   : mListener(aListener)
-  , mShutdown(false)
-{
-  mAddress = NFC_SOCKET_NAME;
-}
+{ }
 
 void
 NfcConsumer::Shutdown()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  mShutdown = true;
   Close();
 }
 
 bool
 NfcConsumer::PostToNfcDaemon(const uint8_t* aData, size_t aSize)
 {
   MOZ_ASSERT(!NS_IsMainThread());
 
--- a/ipc/nfc/Nfc.h
+++ b/ipc/nfc/Nfc.h
@@ -76,16 +76,14 @@ private:
     nsAutoPtr<UnixSocketRawData>& aData) MOZ_OVERRIDE;
 
   void OnConnectSuccess() MOZ_OVERRIDE;
   void OnConnectError() MOZ_OVERRIDE;
   void OnDisconnect() MOZ_OVERRIDE;
 
 private:
   NfcSocketListener* mListener;
-  nsCString mAddress;
-  bool mShutdown;
 };
 
 } // namespace ipc
 } // namepsace mozilla
 
 #endif // mozilla_ipc_Nfc_h