Fix warnings in block devices

Yossi Levy · Yossi Levy · commit dd065e3be1a3 · 2018-09-26T14:35:48.000+03:00
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
@@ -461,7 +461,7 @@ bd_size_t SPIFBlockDevice::get_erase_size(bd_addr_t addr)
 bd_size_t SPIFBlockDevice::size() const
 {
     if (!_is_initialized) {
-        return SPIF_BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _device_size_bytes;
diff --git a/features/storage/blockdevice/BufferedBlockDevice.cpp b/features/storage/blockdevice/BufferedBlockDevice.cpp
@@ -251,7 +251,7 @@ bd_size_t BufferedBlockDevice::get_program_size() const
 bd_size_t BufferedBlockDevice::get_erase_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size();
@@ -260,7 +260,7 @@ bd_size_t BufferedBlockDevice::get_erase_size() const
 bd_size_t BufferedBlockDevice::get_erase_size(bd_addr_t addr) const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size(addr);
@@ -278,7 +278,7 @@ int BufferedBlockDevice::get_erase_value() const
 bd_size_t BufferedBlockDevice::size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->size();
diff --git a/features/storage/blockdevice/ChainingBlockDevice.cpp b/features/storage/blockdevice/ChainingBlockDevice.cpp
@@ -254,7 +254,7 @@ bd_size_t ChainingBlockDevice::get_erase_size() const
 bd_size_t ChainingBlockDevice::get_erase_size(bd_addr_t addr) const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     bd_addr_t bd_start_addr = 0;
diff --git a/features/storage/blockdevice/ExhaustibleBlockDevice.cpp b/features/storage/blockdevice/ExhaustibleBlockDevice.cpp
@@ -142,7 +142,7 @@ int ExhaustibleBlockDevice::erase(bd_addr_t addr, bd_size_t size)
 bd_size_t ExhaustibleBlockDevice::get_read_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_read_size();
@@ -151,7 +151,7 @@ bd_size_t ExhaustibleBlockDevice::get_read_size() const
 bd_size_t ExhaustibleBlockDevice::get_program_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_program_size();
@@ -160,7 +160,7 @@ bd_size_t ExhaustibleBlockDevice::get_program_size() const
 bd_size_t ExhaustibleBlockDevice::get_erase_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size();
@@ -169,7 +169,7 @@ bd_size_t ExhaustibleBlockDevice::get_erase_size() const
 bd_size_t ExhaustibleBlockDevice::get_erase_size(bd_addr_t addr) const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size(addr);
@@ -187,7 +187,7 @@ int ExhaustibleBlockDevice::get_erase_value() const
 bd_size_t ExhaustibleBlockDevice::size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->size();
diff --git a/features/storage/blockdevice/FlashSimBlockDevice.cpp b/features/storage/blockdevice/FlashSimBlockDevice.cpp
@@ -96,7 +96,7 @@ int FlashSimBlockDevice::sync()
 bd_size_t FlashSimBlockDevice::get_read_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_read_size();
@@ -105,7 +105,7 @@ bd_size_t FlashSimBlockDevice::get_read_size() const
 bd_size_t FlashSimBlockDevice::get_program_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_program_size();
@@ -114,7 +114,7 @@ bd_size_t FlashSimBlockDevice::get_program_size() const
 bd_size_t FlashSimBlockDevice::get_erase_size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size();
@@ -123,7 +123,7 @@ bd_size_t FlashSimBlockDevice::get_erase_size() const
 bd_size_t FlashSimBlockDevice::get_erase_size(bd_addr_t addr) const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->get_erase_size(addr);
@@ -132,7 +132,7 @@ bd_size_t FlashSimBlockDevice::get_erase_size(bd_addr_t addr) const
 bd_size_t FlashSimBlockDevice::size() const
 {
     if (!_is_initialized) {
-        return BD_ERROR_DEVICE_ERROR;
+        return 0;
     }
 
     return _bd->size();

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ bd_size_t SPIFBlockDevice::get_erase_size(bd_addr_t addr)`
`461`	`461`	`bd_size_t SPIFBlockDevice::size() const`
`462`	`462`	`{`
`463`	`463`	`if (!_is_initialized) {`
`464`		`- return SPIF_BD_ERROR_DEVICE_ERROR;`
	`464`	`+ return 0;`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`return _device_size_bytes;`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ bd_size_t BufferedBlockDevice::get_program_size() const`
`251`	`251`	`bd_size_t BufferedBlockDevice::get_erase_size() const`
`252`	`252`	`{`
`253`	`253`	`if (!_is_initialized) {`
`254`		`- return BD_ERROR_DEVICE_ERROR;`
	`254`	`+ return 0;`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`return _bd->get_erase_size();`
`@@ -260,7 +260,7 @@ bd_size_t BufferedBlockDevice::get_erase_size() const`
`260`	`260`	`bd_size_t BufferedBlockDevice::get_erase_size(bd_addr_t addr) const`
`261`	`261`	`{`
`262`	`262`	`if (!_is_initialized) {`
`263`		`- return BD_ERROR_DEVICE_ERROR;`
	`263`	`+ return 0;`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`return _bd->get_erase_size(addr);`
`@@ -278,7 +278,7 @@ int BufferedBlockDevice::get_erase_value() const`
`278`	`278`	`bd_size_t BufferedBlockDevice::size() const`
`279`	`279`	`{`
`280`	`280`	`if (!_is_initialized) {`
`281`		`- return BD_ERROR_DEVICE_ERROR;`
	`281`	`+ return 0;`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`return _bd->size();`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ bd_size_t ChainingBlockDevice::get_erase_size() const`
`254`	`254`	`bd_size_t ChainingBlockDevice::get_erase_size(bd_addr_t addr) const`
`255`	`255`	`{`
`256`	`256`	`if (!_is_initialized) {`
`257`		`- return BD_ERROR_DEVICE_ERROR;`
	`257`	`+ return 0;`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`bd_addr_t bd_start_addr = 0;`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ int ExhaustibleBlockDevice::erase(bd_addr_t addr, bd_size_t size)`
`142`	`142`	`bd_size_t ExhaustibleBlockDevice::get_read_size() const`
`143`	`143`	`{`
`144`	`144`	`if (!_is_initialized) {`
`145`		`- return BD_ERROR_DEVICE_ERROR;`
	`145`	`+ return 0;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`return _bd->get_read_size();`
`@@ -151,7 +151,7 @@ bd_size_t ExhaustibleBlockDevice::get_read_size() const`
`151`	`151`	`bd_size_t ExhaustibleBlockDevice::get_program_size() const`
`152`	`152`	`{`
`153`	`153`	`if (!_is_initialized) {`
`154`		`- return BD_ERROR_DEVICE_ERROR;`
	`154`	`+ return 0;`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`return _bd->get_program_size();`
`@@ -160,7 +160,7 @@ bd_size_t ExhaustibleBlockDevice::get_program_size() const`
`160`	`160`	`bd_size_t ExhaustibleBlockDevice::get_erase_size() const`
`161`	`161`	`{`
`162`	`162`	`if (!_is_initialized) {`
`163`		`- return BD_ERROR_DEVICE_ERROR;`
	`163`	`+ return 0;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`return _bd->get_erase_size();`
`@@ -169,7 +169,7 @@ bd_size_t ExhaustibleBlockDevice::get_erase_size() const`
`169`	`169`	`bd_size_t ExhaustibleBlockDevice::get_erase_size(bd_addr_t addr) const`
`170`	`170`	`{`
`171`	`171`	`if (!_is_initialized) {`
`172`		`- return BD_ERROR_DEVICE_ERROR;`
	`172`	`+ return 0;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`return _bd->get_erase_size(addr);`
`@@ -187,7 +187,7 @@ int ExhaustibleBlockDevice::get_erase_value() const`
`187`	`187`	`bd_size_t ExhaustibleBlockDevice::size() const`
`188`	`188`	`{`
`189`	`189`	`if (!_is_initialized) {`
`190`		`- return BD_ERROR_DEVICE_ERROR;`
	`190`	`+ return 0;`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`return _bd->size();`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int FlashSimBlockDevice::sync()`
`96`	`96`	`bd_size_t FlashSimBlockDevice::get_read_size() const`
`97`	`97`	`{`
`98`	`98`	`if (!_is_initialized) {`
`99`		`- return BD_ERROR_DEVICE_ERROR;`
	`99`	`+ return 0;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`return _bd->get_read_size();`
`@@ -105,7 +105,7 @@ bd_size_t FlashSimBlockDevice::get_read_size() const`
`105`	`105`	`bd_size_t FlashSimBlockDevice::get_program_size() const`
`106`	`106`	`{`
`107`	`107`	`if (!_is_initialized) {`
`108`		`- return BD_ERROR_DEVICE_ERROR;`
	`108`	`+ return 0;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`return _bd->get_program_size();`
`@@ -114,7 +114,7 @@ bd_size_t FlashSimBlockDevice::get_program_size() const`
`114`	`114`	`bd_size_t FlashSimBlockDevice::get_erase_size() const`
`115`	`115`	`{`
`116`	`116`	`if (!_is_initialized) {`
`117`		`- return BD_ERROR_DEVICE_ERROR;`
	`117`	`+ return 0;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`return _bd->get_erase_size();`
`@@ -123,7 +123,7 @@ bd_size_t FlashSimBlockDevice::get_erase_size() const`
`123`	`123`	`bd_size_t FlashSimBlockDevice::get_erase_size(bd_addr_t addr) const`
`124`	`124`	`{`
`125`	`125`	`if (!_is_initialized) {`
`126`		`- return BD_ERROR_DEVICE_ERROR;`
	`126`	`+ return 0;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`return _bd->get_erase_size(addr);`
`@@ -132,7 +132,7 @@ bd_size_t FlashSimBlockDevice::get_erase_size(bd_addr_t addr) const`
`132`	`132`	`bd_size_t FlashSimBlockDevice::size() const`
`133`	`133`	`{`
`134`	`134`	`if (!_is_initialized) {`
`135`		`- return BD_ERROR_DEVICE_ERROR;`
	`135`	`+ return 0;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`return _bd->size();`