Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-12 07:35:45 +03:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove unnecessary null checks (nw)

Browse Source
This commit is contained in:
balr0g 2015-05-15 21:59:56 -04:00
parent 9aa1670e6f
commit 53635d12d7
3 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/emu/device.c
View File

@ -124,10 +124,6 @@ device_t::~device_t()
memory_region *device_t::memregion(const char *_tag) const memory_region *device_t::memregion(const char *_tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// build a fully-qualified name and look it up // build a fully-qualified name and look it up
return machine().memory().region(subtag(_tag).c_str()); return machine().memory().region(subtag(_tag).c_str());
} }
@ -140,10 +136,6 @@ memory_region *device_t::memregion(const char *_tag) const
memory_share *device_t::memshare(const char *_tag) const memory_share *device_t::memshare(const char *_tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// build a fully-qualified name and look it up // build a fully-qualified name and look it up
return machine().memory().shared(subtag(_tag).c_str()); return machine().memory().shared(subtag(_tag).c_str());
} }
@ -156,10 +148,6 @@ memory_share *device_t::memshare(const char *_tag) const
memory_bank *device_t::membank(const char *_tag) const memory_bank *device_t::membank(const char *_tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// build a fully-qualified name and look it up // build a fully-qualified name and look it up
return machine().memory().bank(subtag(_tag).c_str()); return machine().memory().bank(subtag(_tag).c_str());
} }
@ -172,10 +160,6 @@ memory_bank *device_t::membank(const char *_tag) const
ioport_port *device_t::ioport(const char *tag) const ioport_port *device_t::ioport(const char *tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// build a fully-qualified name and look it up // build a fully-qualified name and look it up
return machine().ioport().port(subtag(tag).c_str()); return machine().ioport().port(subtag(tag).c_str());
} }
@ -188,10 +172,6 @@ ioport_port *device_t::ioport(const char *tag) const
std::string device_t::parameter(const char *tag) const std::string device_t::parameter(const char *tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// build a fully-qualified name and look it up // build a fully-qualified name and look it up
return machine().parameters().lookup(subtag(tag)); return machine().parameters().lookup(subtag(tag));
} }

8
src/emu/device.h
View File

@ -584,10 +584,6 @@ private:
inline device_t *device_t::subdevice(const char *tag) const inline device_t *device_t::subdevice(const char *tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// empty string or NULL means this device // empty string or NULL means this device
if (tag == NULL || *tag == 0) if (tag == NULL || *tag == 0)
return const_cast<device_t *>(this); return const_cast<device_t *>(this);
@ -605,10 +601,6 @@ inline device_t *device_t::subdevice(const char *tag) const
inline device_t *device_t::siblingdevice(const char *tag) const inline device_t *device_t::siblingdevice(const char *tag) const
{ {
// safety first
if (this == NULL)
return NULL;
// empty string or NULL means this device // empty string or NULL means this device
if (tag == NULL || *tag == 0) if (tag == NULL || *tag == 0)
return const_cast<device_t *>(this); return const_cast<device_t *>(this);

2
src/emu/memory.h
View File

@ -653,7 +653,7 @@ public:
// getters // getters
memory_share *next() const { return m_next; } memory_share *next() const { return m_next; }
void *ptr() const { if (this == NULL) return NULL; return m_ptr; } void *ptr() const { return m_ptr; }
size_t bytes() const { return m_bytes; } size_t bytes() const { return m_bytes; }
endianness_t endianness() const { return m_endianness; } endianness_t endianness() const { return m_endianness; }
UINT8 bitwidth() const { return m_bitwidth; } UINT8 bitwidth() const { return m_bitwidth; }