gecko-dev/netwerk/cache2/CacheHashUtils.h
Valentin Gosu 1a1f42da37 Bug 1714307 - Run modernize-use-default-member-init --fix check on netwerk r=necko-reviewers,kershaw
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
2021-06-11 07:10:41 +00:00

70 lines
1.8 KiB
C++

/* 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 CacheHashUtils__h__
#define CacheHashUtils__h__
#include "nsISupports.h"
#include "mozilla/Types.h"
#include "prnetdb.h"
#include "nsPrintfCString.h"
#define LOGSHA1(x) \
PR_htonl((reinterpret_cast<const uint32_t*>(x))[0]), \
PR_htonl((reinterpret_cast<const uint32_t*>(x))[1]), \
PR_htonl((reinterpret_cast<const uint32_t*>(x))[2]), \
PR_htonl((reinterpret_cast<const uint32_t*>(x))[3]), \
PR_htonl((reinterpret_cast<const uint32_t*>(x))[4])
#define SHA1STRING(x) \
(nsPrintfCString("%08x%08x%08x%08x%08x", LOGSHA1(x)).get())
namespace mozilla {
class OriginAttributes;
namespace net {
class CacheHash : public nsISupports {
public:
NS_DECL_THREADSAFE_ISUPPORTS
using Hash16_t = uint16_t;
using Hash32_t = uint32_t;
static Hash32_t Hash(const char* aData, uint32_t aSize,
uint32_t aInitval = 0);
static Hash16_t Hash16(const char* aData, uint32_t aSize,
uint32_t aInitval = 0);
explicit CacheHash(uint32_t aInitval = 0);
void Update(const char* aData, uint32_t aLen);
Hash32_t GetHash();
Hash16_t GetHash16();
private:
virtual ~CacheHash() = default;
void Feed(uint32_t aVal, uint8_t aLen = 4);
static const uint32_t kGoldenRation = 0x9e3779b9;
uint32_t mA{kGoldenRation}, mB{kGoldenRation}, mC;
uint8_t mPos{0};
uint32_t mBuf{0};
uint8_t mBufPos{0};
uint32_t mLength{0};
bool mFinalized{false};
};
using OriginAttrsHash = uint64_t;
OriginAttrsHash GetOriginAttrsHash(const mozilla::OriginAttributes& aOA);
} // namespace net
} // namespace mozilla
#endif