Bug 1473453 - Part 2: QuotaManager: disambiguate null check of bool pointer. r?janv
Fix clang-tidy warning about bool pointers:
[misc-bool-pointer-implicit-conversion] dom/quota/ActorsParent.cpp:4168:7: warning: dubious check of 'bool *' against 'nullptr', did you mean to dereference it?
MozReview-Commit-ID: C6QdeJlf71C
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -4142,17 +4142,17 @@ QuotaManager::GetDirectoryMetadata2WithR
nsresult
QuotaManager::GetDirectoryMetadata2(nsIFile* aDirectory,
int64_t* aTimestamp,
bool* aPersisted)
{
AssertIsOnIOThread();
MOZ_ASSERT(aDirectory);
- MOZ_ASSERT(aTimestamp || aPersisted);
+ MOZ_ASSERT(aTimestamp != nullptr || aPersisted != nullptr);
MOZ_ASSERT(mStorageInitialized);
nsCOMPtr<nsIBinaryInputStream> binaryStream;
nsresult rv = GetBinaryInputStream(aDirectory,
NS_LITERAL_STRING(METADATA_V2_FILE_NAME),
getter_AddRefs(binaryStream));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@@ -4160,27 +4160,27 @@ QuotaManager::GetDirectoryMetadata2(nsIF
uint64_t timestamp;
rv = binaryStream->Read64(×tamp);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
bool persisted;
- if (aPersisted) {
+ if (aPersisted != nullptr) {
rv = binaryStream->ReadBoolean(&persisted);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
}
- if (aTimestamp) {
+ if (aTimestamp != nullptr) {
*aTimestamp = timestamp;
}
- if (aPersisted) {
+ if (aPersisted != nullptr) {
*aPersisted = persisted;
}
return NS_OK;
}
nsresult
QuotaManager::GetDirectoryMetadata2WithRestore(nsIFile* aDirectory,
bool aPersistent,