Remove unceressary NULL check from BufferedBlockDevice::size()

Seppo Takalo · Seppo Takalo · commit 6105634bb0fc · 2019-12-03T14:38:40.000+02:00
diff --git a/features/storage/blockdevice/BufferedBlockDevice.cpp b/features/storage/blockdevice/BufferedBlockDevice.cpp
@@ -31,6 +31,7 @@ BufferedBlockDevice::BufferedBlockDevice(BlockDevice *bd)
     : _bd(bd), _bd_program_size(0), _bd_read_size(0), _bd_size(0), _write_cache_addr(0), _write_cache_valid(false),
       _write_cache(0), _read_buf(0), _init_ref_count(0), _is_initialized(false)
 {
+    MBED_ASSERT(_bd);
 }
 
 BufferedBlockDevice::~BufferedBlockDevice()
@@ -332,11 +333,7 @@ bd_size_t BufferedBlockDevice::size() const
 
 const char *BufferedBlockDevice::get_type() const
 {
-    if (_bd != NULL) {
-        return _bd->get_type();
-    }
-
-    return NULL;
+    return _bd->get_type();
 }
 
 } // namespace mbed

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ BufferedBlockDevice::BufferedBlockDevice(BlockDevice *bd)`
`31`	`31`	`: _bd(bd), _bd_program_size(0), _bd_read_size(0), _bd_size(0), _write_cache_addr(0), _write_cache_valid(false),`
`32`	`32`	`_write_cache(0), _read_buf(0), _init_ref_count(0), _is_initialized(false)`
`33`	`33`	`{`
	`34`	`+ MBED_ASSERT(_bd);`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`BufferedBlockDevice::~BufferedBlockDevice()`
`@@ -332,11 +333,7 @@ bd_size_t BufferedBlockDevice::size() const`
`332`	`333`
`333`	`334`	`const char *BufferedBlockDevice::get_type() const`
`334`	`335`	`{`
`335`		`- if (_bd != NULL) {`
`336`		`- return _bd->get_type();`
`337`		`- }`
`338`		`-`
`339`		`- return NULL;`
	`336`	`+ return _bd->get_type();`
`340`	`337`	`}`
`341`	`338`
`342`	`339`	`} // namespace mbed`