mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 15:25:52 +00:00
1a1f42da37
This changeset is the result of adding modernize-use-default-member-init to tools/clang-tidy/config.yaml then proceeding to run `./mach static-analysis check netwerk/ --fix` I then went through the resulting fix and manually updated all of the member variables which were missed due to them having a non-trivial constructor. Note that the tool was only run on Linux, so code that only runs on some platforms may have been missed. The member variables that are still initialized in the contructor definition are: - bitfields (not all currently supported compilers allow default-member-init - variables that are initialized via a parameter - variables that use code not visible in the header file There are a few advantages to landing this change: - fewer lines of code - now declaration is in the same place as initialization this also makes it easier to see when looking at the header. - it makes it harder to miss initializing a member when adding a new contructor - variables that depend on an include guard look much nicer now Additionally I removed some unnecessary reinitialization of NetAddr members (it has a constructor that does that now), and changed nsWifiScannerDBus to use the thread-safe strtok_r instead of strtok. Differential Revision: https://phabricator.services.mozilla.com/D116980
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
/* vim:set ts=2 sw=2 et cindent: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef nsServerSocket_h__
|
|
#define nsServerSocket_h__
|
|
|
|
#include "prio.h"
|
|
#include "nsASocketHandler.h"
|
|
#include "nsIServerSocket.h"
|
|
#include "mozilla/Mutex.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class nsIEventTarget;
|
|
namespace mozilla {
|
|
namespace net {
|
|
union NetAddr;
|
|
|
|
class nsServerSocket : public nsASocketHandler, public nsIServerSocket {
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSISERVERSOCKET
|
|
|
|
// nsASocketHandler methods:
|
|
virtual void OnSocketReady(PRFileDesc* fd, int16_t outFlags) override;
|
|
virtual void OnSocketDetached(PRFileDesc* fd) override;
|
|
virtual void IsLocal(bool* aIsLocal) override;
|
|
virtual void KeepWhenOffline(bool* aKeepWhenOffline) override;
|
|
|
|
virtual uint64_t ByteCountSent() override { return 0; }
|
|
virtual uint64_t ByteCountReceived() override { return 0; }
|
|
nsServerSocket();
|
|
|
|
virtual void CreateClientTransport(PRFileDesc* clientFD,
|
|
const mozilla::net::NetAddr& clientAddr);
|
|
virtual nsresult SetSocketDefaults() { return NS_OK; }
|
|
virtual nsresult OnSocketListen() { return NS_OK; }
|
|
|
|
protected:
|
|
virtual ~nsServerSocket();
|
|
PRFileDesc* mFD{nullptr};
|
|
nsCOMPtr<nsIServerSocketListener> mListener;
|
|
|
|
private:
|
|
void OnMsgClose();
|
|
void OnMsgAttach();
|
|
|
|
// try attaching our socket (mFD) to the STS's poll list.
|
|
nsresult TryAttach();
|
|
|
|
// lock protects access to mListener; so it is not cleared while being used.
|
|
mozilla::Mutex mLock{"nsServerSocket.mLock"};
|
|
PRNetAddr mAddr = {.raw = {0, {0}}};
|
|
nsCOMPtr<nsIEventTarget> mListenerTarget;
|
|
bool mAttached{false};
|
|
bool mKeepWhenOffline{false};
|
|
};
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#endif // nsServerSocket_h__
|