Dedupe RETURN_STATUS_IF_ERROR macro
Move the definition to 'AidlConversionUtil.h' and
get rid of the copies.
Bug: 198812639
Test: m
Change-Id: I373c4449721b69aa104d45a599ba1aa1304bcb4d
diff --git a/media/libaudioclient/AudioAttributes.cpp b/media/libaudioclient/AudioAttributes.cpp
index 83bf5a7..260c06c 100644
--- a/media/libaudioclient/AudioAttributes.cpp
+++ b/media/libaudioclient/AudioAttributes.cpp
@@ -24,9 +24,6 @@
#include <media/AudioAttributes.h>
#include <media/PolicyAidlConversion.h>
-#define RETURN_STATUS_IF_ERROR(x) \
- { auto _tmp = (x); if (_tmp != OK) return _tmp; }
-
namespace android {
status_t AudioAttributes::readFromParcel(const Parcel* parcel) {
diff --git a/media/libaudioclient/AudioEffect.cpp b/media/libaudioclient/AudioEffect.cpp
index 65daa3c..3a97945 100644
--- a/media/libaudioclient/AudioEffect.cpp
+++ b/media/libaudioclient/AudioEffect.cpp
@@ -32,12 +32,6 @@
#include <private/media/AudioEffectShared.h>
#include <utils/Log.h>
-#define RETURN_STATUS_IF_ERROR(x) \
- { \
- auto _tmp = (x); \
- if (_tmp != OK) return _tmp; \
- }
-
namespace android {
using aidl_utils::statusTFromBinderStatus;
using binder::Status;
diff --git a/media/libaudioclient/AudioProductStrategy.cpp b/media/libaudioclient/AudioProductStrategy.cpp
index f98027a..ecd423a 100644
--- a/media/libaudioclient/AudioProductStrategy.cpp
+++ b/media/libaudioclient/AudioProductStrategy.cpp
@@ -21,9 +21,6 @@
#include <media/AudioAttributes.h>
#include <media/PolicyAidlConversion.h>
-#define RETURN_STATUS_IF_ERROR(x) \
- { auto _tmp = (x); if (_tmp != OK) return _tmp; }
-
namespace android {
status_t AudioProductStrategy::readFromParcel(const Parcel* parcel) {
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 317ad1e..377af28 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -40,12 +40,6 @@
if (!_tmp.ok()) return aidl_utils::binderStatusFromStatusT(_tmp.error()); \
std::move(_tmp.value()); })
-#define RETURN_STATUS_IF_ERROR(x) \
- { \
- auto _tmp = (x); \
- if (_tmp != OK) return _tmp; \
- }
-
// ----------------------------------------------------------------------------
namespace android {
diff --git a/media/libaudioclient/AudioVolumeGroup.cpp b/media/libaudioclient/AudioVolumeGroup.cpp
index 36696cd..ab95246 100644
--- a/media/libaudioclient/AudioVolumeGroup.cpp
+++ b/media/libaudioclient/AudioVolumeGroup.cpp
@@ -26,9 +26,6 @@
#include <media/AudioAttributes.h>
#include <media/PolicyAidlConversion.h>
-#define RETURN_STATUS_IF_ERROR(x) \
- { auto _tmp = (x); if (_tmp != OK) return _tmp; }
-
namespace android {
using media::audio::common::AudioStreamType;
diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index d3098b8..88e7396 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -48,12 +48,6 @@
std::move(_tmp.value()); \
})
-#define RETURN_STATUS_IF_ERROR(x) \
- { \
- auto _tmp = (x); \
- if (_tmp != OK) return _tmp; \
- }
-
#define RETURN_BINDER_IF_ERROR(x) \
{ \
auto _tmp = (x); \
diff --git a/media/libaudioclient/include/media/AidlConversionUtil.h b/media/libaudioclient/include/media/AidlConversionUtil.h
index f9446ad..dfabd55 100644
--- a/media/libaudioclient/include/media/AidlConversionUtil.h
+++ b/media/libaudioclient/include/media/AidlConversionUtil.h
@@ -41,6 +41,9 @@
#define RETURN_IF_ERROR(result) \
if (status_t _tmp = (result); _tmp != OK) return base::unexpected(_tmp);
+#define RETURN_STATUS_IF_ERROR(result) \
+ if (status_t _tmp = (result); _tmp != OK) return _tmp;
+
#define VALUE_OR_RETURN_STATUS(x) \
({ \
auto _tmp = (x); \