Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1038853 - Use nullptr instead of 0 in Shmem.h and Shmem.cpp. r=bent

Browse Source
This commit is contained in:
Andrew McCreight 2014-07-15 16:51:44 -07:00
parent 52d26b4f2d
commit de19994a7f
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ipc/glue/Shmem.cpp
View File

@ -123,10 +123,10 @@ CreateSegment(size_t aNBytes, SharedMemorySysV::Handle aHandle)
segment = new SharedMemorySysV();
if (!segment->Create(aNBytes))
return 0;
return nullptr;
}
if (!segment->Map(aNBytes))
return 0;
return nullptr;
segment->AddRef();
return segment.forget();
@ -145,10 +145,10 @@ CreateSegment(size_t aNBytes, SharedMemoryBasic::Handle aHandle)
segment = new SharedMemoryBasic();
if (!segment->Create(aNBytes))
return 0;
return nullptr;
}
if (!segment->Map(aNBytes))
return 0;
return nullptr;
segment->AddRef();
return segment.forget();
@ -281,7 +281,7 @@ Unprotect(SharedMemory* aSegment)
Shmem::Shmem(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
SharedMemory* aSegment, id_t aId) :
mSegment(aSegment),
mData(0),
mData(nullptr),
mSize(0)
{
NS_ABORT_IF_FALSE(mSegment, "NULL segment");
@ -376,7 +376,7 @@ Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
}
if (!segment)
return 0;
return nullptr;
Header* header;
char *frontSentinel;
@ -413,13 +413,13 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
return nullptr;
}
void* iter = 0;
void* iter = nullptr;
SharedMemory::SharedMemoryType type;
size_t size;
if (!ShmemCreated::ReadInfo(&aDescriptor, &iter, aId, &size, &type))
return 0;
return nullptr;
SharedMemory* segment = 0;
SharedMemory* segment = nullptr;
size_t pageSize = SharedMemory::SystemPageSize();
// |2*pageSize| is for the front and back sentinels
size_t segmentSize = SharedMemory::PageAlignedSize(size + 2*pageSize);
@ -427,7 +427,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
if (SharedMemory::TYPE_BASIC == type) {
SharedMemoryBasic::Handle handle;
if (!ShmemCreated::ReadHandle(&aDescriptor, &iter, &handle))
return 0;
return nullptr;
if (!SharedMemoryBasic::IsHandleValid(handle)) {
NS_ERROR("trying to open invalid handle");
@ -439,7 +439,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
else if (SharedMemory::TYPE_SYSV == type) {
SharedMemorySysV::Handle handle;
if (!ShmemCreated::ReadHandle(&aDescriptor, &iter, &handle))
return 0;
return nullptr;
if (!SharedMemorySysV::IsHandleValid(handle)) {
NS_ERROR("trying to open invalid handle");
@ -454,7 +454,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
}
if (!segment)
return 0;
return nullptr;
Header* header = GetHeader(segment);
@ -501,7 +501,7 @@ Shmem::Dealloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
// static
Shmem::SharedMemory*
Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
size_t aNBytes,
size_t aNBytes,
SharedMemoryType aType,
bool /*unused*/,
bool /*unused*/)
@ -521,7 +521,7 @@ Shmem::Alloc(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
}
if (!segment)
return 0;
return nullptr;
*PtrToSize(segment) = static_cast<uint32_t>(aNBytes);
@ -540,18 +540,18 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
}
SharedMemory::SharedMemoryType type;
void* iter = 0;
void* iter = nullptr;
size_t size;
if (!ShmemCreated::ReadInfo(&aDescriptor, &iter, aId, &size, &type))
return 0;
return nullptr;
SharedMemory* segment = 0;
SharedMemory* segment = nullptr;
size_t segmentSize = SharedMemory::PageAlignedSize(size + sizeof(uint32_t));
if (SharedMemory::TYPE_BASIC == type) {
SharedMemoryBasic::Handle handle;
if (!ShmemCreated::ReadHandle(&aDescriptor, &iter, &handle))
return 0;
return nullptr;
if (!SharedMemoryBasic::IsHandleValid(handle)) {
return nullptr;
@ -563,7 +563,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
else if (SharedMemory::TYPE_SYSV == type) {
SharedMemorySysV::Handle handle;
if (!ShmemCreated::ReadHandle(&aDescriptor, &iter, &handle))
return 0;
return nullptr;
if (!SharedMemorySysV::IsHandleValid(handle)) {
return nullptr;
@ -576,7 +576,7 @@ Shmem::OpenExisting(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
}
if (!segment)
return 0;
return nullptr;
// this is the only validity check done in non-DEBUG builds
if (size != static_cast<size_t>(*PtrToSize(segment))) {
@ -632,7 +632,7 @@ Shmem::ShareTo(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
SharedMemoryBasic* seg = static_cast<SharedMemoryBasic*>(mSegment);
SharedMemoryBasic::Handle handle;
if (!seg->ShareToProcess(aProcess, &handle))
return 0;
return nullptr;
return new ShmemCreated(routingId, mId, mSize, handle);
}
@ -647,7 +647,7 @@ Shmem::ShareTo(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead,
return nullptr;
}
return 0;
return nullptr;
}
IPC::Message*

8
ipc/glue/Shmem.h
View File

@ -76,8 +76,8 @@ public:
struct IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead {};
Shmem() :
mSegment(0),
mData(0),
mSegment(nullptr),
mData(nullptr),
mSize(0),
mId(0)
{
@ -195,8 +195,8 @@ public:
void forget(IHadBetterBeIPDLCodeCallingThis_OtherwiseIAmADoodyhead)
{
mSegment = 0;
mData = 0;
mSegment = nullptr;
mData = nullptr;
mSize = 0;
mId = 0;
}