From 2b67e7ecdd3a8ff159a046d5d5e2bcf5d8949805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Mon, 13 May 2024 07:20:59 +0000 Subject: [PATCH] fixed e1477ac from https://gitee.com/baodaoqianju/powermgr_display_manager/pulls/431 fix: Modifying the macro name of a macro function does not have a prominent feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- .../src/display_brightness_callback_proxy.cpp | 4 +- .../src/display_brightness_callback_stub.cpp | 4 +- .../zidl/src/display_power_callback_proxy.cpp | 6 +- .../zidl/src/display_power_callback_stub.cpp | 6 +- .../zidl/src/display_power_mgr_proxy.cpp | 56 +++++++++---------- .../zidl/src/display_power_mgr_stub.cpp | 54 +++++++++--------- .../utils/native/include/display_common.h | 8 +-- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/state_manager/service/zidl/src/display_brightness_callback_proxy.cpp b/state_manager/service/zidl/src/display_brightness_callback_proxy.cpp index bb4ab65..1aec9ce 100644 --- a/state_manager/service/zidl/src/display_brightness_callback_proxy.cpp +++ b/state_manager/service/zidl/src/display_brightness_callback_proxy.cpp @@ -38,8 +38,8 @@ void DisplayBrightnessCallbackProxy::OnNotifyApsLightBrightnessChange(uint32_t t return; } - WRITE_PARCEL_NO_RET(data, Uint32, type); - WRITE_PARCEL_NO_RET(data, Bool, state); + RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(data, Uint32, type); + RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(data, Bool, state); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayBrightnessCallbackInterfaceCode::ON_NOTIFY_APS_LIGHT_BRIGHTNESS_CHANGE), data, diff --git a/state_manager/service/zidl/src/display_brightness_callback_stub.cpp b/state_manager/service/zidl/src/display_brightness_callback_stub.cpp index 4d4c073..6afdc0e 100644 --- a/state_manager/service/zidl/src/display_brightness_callback_stub.cpp +++ b/state_manager/service/zidl/src/display_brightness_callback_stub.cpp @@ -62,8 +62,8 @@ int32_t DisplayBrightnessCallbackStub::OnNotifyApsLightBrightnessChangeStub(Mess uint32_t type = 0; bool state = false; - READ_PARCEL_WITH_RET(data, Uint32, type, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Bool, state, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, type, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Bool, state, E_READ_PARCEL_ERROR); OnNotifyApsLightBrightnessChange(type, state); return ERR_OK; diff --git a/state_manager/service/zidl/src/display_power_callback_proxy.cpp b/state_manager/service/zidl/src/display_power_callback_proxy.cpp index 4bff9fd..0dbfca6 100644 --- a/state_manager/service/zidl/src/display_power_callback_proxy.cpp +++ b/state_manager/service/zidl/src/display_power_callback_proxy.cpp @@ -38,9 +38,9 @@ void DisplayPowerCallbackProxy::OnDisplayStateChanged(uint32_t displayId, Displa return; } - WRITE_PARCEL_NO_RET(data, Uint32, displayId); - WRITE_PARCEL_NO_RET(data, Uint32, static_cast(state)); - WRITE_PARCEL_NO_RET(data, Uint32, reason); + RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(data, Uint32, displayId); + RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(data, Uint32, static_cast(state)); + RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(data, Uint32, reason); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerCallbackInterfaceCode::ON_DISPLAY_STATE_CHANGED), diff --git a/state_manager/service/zidl/src/display_power_callback_stub.cpp b/state_manager/service/zidl/src/display_power_callback_stub.cpp index 2546555..124d0fe 100644 --- a/state_manager/service/zidl/src/display_power_callback_stub.cpp +++ b/state_manager/service/zidl/src/display_power_callback_stub.cpp @@ -61,9 +61,9 @@ int32_t DisplayPowerCallbackStub::OnDisplayStateChangedStub(MessageParcel& data, uint32_t state = 0; uint32_t reason = 0; - READ_PARCEL_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, state, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, reason, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, state, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, reason, E_READ_PARCEL_ERROR); OnDisplayStateChanged(id, static_cast(state), reason); return ERR_OK; diff --git a/state_manager/service/zidl/src/display_power_mgr_proxy.cpp b/state_manager/service/zidl/src/display_power_mgr_proxy.cpp index dcf4e8c..b9e7b87 100644 --- a/state_manager/service/zidl/src/display_power_mgr_proxy.cpp +++ b/state_manager/service/zidl/src/display_power_mgr_proxy.cpp @@ -39,9 +39,9 @@ bool DisplayPowerMgrProxy::SetDisplayState(uint32_t id, DisplayState state, uint return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, id, false); - WRITE_PARCEL_WITH_RET(data, Uint32, static_cast(state), false); - WRITE_PARCEL_WITH_RET(data, Uint32, reason, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, id, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, static_cast(state), false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, reason, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::SET_DISPLAY_STATE), @@ -74,7 +74,7 @@ DisplayState DisplayPowerMgrProxy::GetDisplayState(uint32_t id) return DisplayState::DISPLAY_UNKNOWN; } - WRITE_PARCEL_WITH_RET(data, Uint32, id, DisplayState::DISPLAY_UNKNOWN); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, id, DisplayState::DISPLAY_UNKNOWN); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::GET_DISPLAY_STATE), @@ -181,9 +181,9 @@ bool DisplayPowerMgrProxy::SetBrightness(uint32_t value, uint32_t displayId, boo return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, value, false); - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); - WRITE_PARCEL_WITH_RET(data, Bool, continuous, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, value, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Bool, continuous, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::SET_BRIGHTNESS), @@ -198,7 +198,7 @@ bool DisplayPowerMgrProxy::SetBrightness(uint32_t value, uint32_t displayId, boo return result; } int32_t error; - READ_PARCEL_WITH_RET(reply, Int32, error, result); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(reply, Int32, error, result); lastError_ = static_cast(error); return result; @@ -219,8 +219,8 @@ bool DisplayPowerMgrProxy::DiscountBrightness(double discount, uint32_t displayI return result; } - WRITE_PARCEL_WITH_RET(data, Double, discount, false); - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Double, discount, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::DISCOUNT_BRIGHTNESS), @@ -253,8 +253,8 @@ bool DisplayPowerMgrProxy::OverrideBrightness(uint32_t value, uint32_t displayId return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, value, false); - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, value, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::OVERRIDE_BRIGHTNESS), @@ -287,7 +287,7 @@ bool DisplayPowerMgrProxy::OverrideDisplayOffDelay(uint32_t delayMs) return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, delayMs, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, delayMs, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::OVERRIDE_DISPLAY_OFF_DELAY), @@ -321,7 +321,7 @@ bool DisplayPowerMgrProxy::RestoreBrightness(uint32_t displayId) return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::RESTORE_BRIGHTNESS), @@ -355,7 +355,7 @@ uint32_t DisplayPowerMgrProxy::GetBrightness(uint32_t displayId) return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest(static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::GET_BRIGHTNESS), data, reply, option); @@ -483,9 +483,9 @@ bool DisplayPowerMgrProxy::AdjustBrightness(uint32_t id, int32_t value, uint32_t return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, id, false); - WRITE_PARCEL_WITH_RET(data, Int32, value, false); - WRITE_PARCEL_WITH_RET(data, Int32, duration, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, id, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Int32, value, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Int32, duration, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::ADJUST_BRIGHTNESS), @@ -518,7 +518,7 @@ bool DisplayPowerMgrProxy::AutoAdjustBrightness(bool enable) return result; } - WRITE_PARCEL_WITH_RET(data, Bool, enable, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Bool, enable, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::AUTO_ADJUST_BRIGHTNESS), @@ -582,7 +582,7 @@ bool DisplayPowerMgrProxy::RegisterCallback(sptr callback return result; } - WRITE_PARCEL_WITH_RET(data, RemoteObject, callback->AsObject(), false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, RemoteObject, callback->AsObject(), false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::REGISTER_CALLBACK), @@ -615,8 +615,8 @@ bool DisplayPowerMgrProxy::BoostBrightness(int32_t timeoutMs, uint32_t displayId return result; } - WRITE_PARCEL_WITH_RET(data, Int32, timeoutMs, false); - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Int32, timeoutMs, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::BOOST_BRIGHTNESS), @@ -648,7 +648,7 @@ bool DisplayPowerMgrProxy::CancelBoostBrightness(uint32_t displayId) DISPLAY_HILOGE(COMP_FWK, "write descriptor failed!"); return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::CANCEL_BOOST_BRIGHTNESS), @@ -682,7 +682,7 @@ uint32_t DisplayPowerMgrProxy::GetDeviceBrightness(uint32_t displayId) return result; } - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::GET_DEVICE_BRIGHTNESS), @@ -715,8 +715,8 @@ bool DisplayPowerMgrProxy::SetCoordinated(bool coordinated, uint32_t displayId) return result; } - WRITE_PARCEL_WITH_RET(data, Bool, coordinated, false); - WRITE_PARCEL_WITH_RET(data, Uint32, displayId, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Bool, coordinated, false); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, false); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::SET_COORDINATED), @@ -750,8 +750,8 @@ uint32_t DisplayPowerMgrProxy::SetLightBrightnessThreshold( return result; } - WRITE_PARCEL_WITH_RET(data, Int32Vector, threshold, result); - WRITE_PARCEL_WITH_RET(data, RemoteObject, callback->AsObject(), result); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, Int32Vector, threshold, result); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(data, RemoteObject, callback->AsObject(), result); int ret = remote->SendRequest( static_cast(PowerMgr::DisplayPowerMgrInterfaceCode::SET_APS_LIGHT_AND_BRIGHTNESS_THRESOLD), data, reply, diff --git a/state_manager/service/zidl/src/display_power_mgr_stub.cpp b/state_manager/service/zidl/src/display_power_mgr_stub.cpp index 8bb07ea..88232ab 100644 --- a/state_manager/service/zidl/src/display_power_mgr_stub.cpp +++ b/state_manager/service/zidl/src/display_power_mgr_stub.cpp @@ -142,9 +142,9 @@ int32_t DisplayPowerMgrStub::SetDisplayStateStub(MessageParcel& data, MessagePar uint32_t state = 0; uint32_t reason = 0; - READ_PARCEL_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, state, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, reason, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, state, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, reason, E_READ_PARCEL_ERROR); bool ret = SetDisplayState(id, static_cast(state), reason); if (!reply.WriteBool(ret)) { @@ -158,7 +158,7 @@ int32_t DisplayPowerMgrStub::GetDisplayStateStub(MessageParcel& data, MessagePar { uint32_t id = 0; - READ_PARCEL_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); DisplayState ret = GetDisplayState(id); if (!reply.WriteUint32(static_cast(ret))) { @@ -199,9 +199,9 @@ int32_t DisplayPowerMgrStub::SetBrightnessStub(MessageParcel& data, MessageParce uint32_t displayId = 0; bool continuous = false; - READ_PARCEL_WITH_RET(data, Uint32, value, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Bool, continuous, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, value, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Bool, continuous, E_READ_PARCEL_ERROR); bool ret = SetBrightness(value, displayId, continuous); if (!reply.WriteBool(ret)) { @@ -209,7 +209,7 @@ int32_t DisplayPowerMgrStub::SetBrightnessStub(MessageParcel& data, MessageParce return E_WRITE_PARCEL_ERROR; } int32_t error = static_cast(GetError()); - WRITE_PARCEL_WITH_RET(reply, Int32, error, E_WRITE_PARCEL_ERROR); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(reply, Int32, error, E_WRITE_PARCEL_ERROR); return ERR_OK; } @@ -218,8 +218,8 @@ int32_t DisplayPowerMgrStub::DiscountBrightnessStub(MessageParcel& data, Message double discount = 0; uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Double, discount, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Double, discount, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); bool ret = DiscountBrightness(discount, displayId); if (!reply.WriteBool(ret)) { @@ -234,8 +234,8 @@ int32_t DisplayPowerMgrStub::OverrideBrightnessStub(MessageParcel& data, Message uint32_t value = 0; uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Uint32, value, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, value, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); bool ret = OverrideBrightness(value, displayId); if (!reply.WriteBool(ret)) { @@ -249,7 +249,7 @@ int32_t DisplayPowerMgrStub::OverrideDisplayOffDelayStub(MessageParcel& data, Me { uint32_t delayMs = 0; - READ_PARCEL_WITH_RET(data, Uint32, delayMs, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, delayMs, E_READ_PARCEL_ERROR); bool ret = OverrideDisplayOffDelay(delayMs); if (!reply.WriteBool(ret)) { @@ -263,7 +263,7 @@ int32_t DisplayPowerMgrStub::RestoreBrightnessStub(MessageParcel& data, MessageP { uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); bool ret = RestoreBrightness(displayId); if (!reply.WriteBool(ret)) { @@ -277,7 +277,7 @@ int32_t DisplayPowerMgrStub::GetBrightnessStub(MessageParcel& data, MessageParce { uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); uint32_t ret = GetBrightness(displayId); if (!reply.WriteUint32(ret)) { @@ -323,9 +323,9 @@ int32_t DisplayPowerMgrStub::AdjustBrightnessStub(MessageParcel& data, MessagePa int32_t value = 0; uint32_t duration = 0; - READ_PARCEL_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Int32, value, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, duration, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Int32, value, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, duration, E_READ_PARCEL_ERROR); bool ret = AdjustBrightness(id, value, duration); if (!reply.WriteBool(ret)) { @@ -339,7 +339,7 @@ int32_t DisplayPowerMgrStub::AutoAdjustBrightnessStub(MessageParcel& data, Messa { bool enable = 0; - READ_PARCEL_WITH_RET(data, Bool, enable, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Bool, enable, E_READ_PARCEL_ERROR); bool ret = AutoAdjustBrightness(enable); if (!reply.WriteBool(ret)) { @@ -366,7 +366,7 @@ int32_t DisplayPowerMgrStub::RegisterCallbackStub(MessageParcel& data, MessagePa sptr callback = iface_cast(obj); RETURN_IF_WITH_RET((callback == nullptr), E_READ_PARCEL_ERROR); bool isSucc = RegisterCallback(callback); - WRITE_PARCEL_WITH_RET(reply, Bool, isSucc, E_WRITE_PARCEL_ERROR); + RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(reply, Bool, isSucc, E_WRITE_PARCEL_ERROR); return ERR_OK; } @@ -374,8 +374,8 @@ int32_t DisplayPowerMgrStub::BoostBrightnessStub(MessageParcel& data, MessagePar { int32_t timeoutMs = -1; uint32_t id = 0; - READ_PARCEL_WITH_RET(data, Int32, timeoutMs, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Int32, timeoutMs, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, id, E_READ_PARCEL_ERROR); bool isScuu = BoostBrightness(timeoutMs, id); if (!reply.WriteBool(isScuu)) { @@ -389,7 +389,7 @@ int32_t DisplayPowerMgrStub::CancelBoostBrightnessStub(MessageParcel& data, Mess { uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); bool isScuu = CancelBoostBrightness(displayId); if (!reply.WriteBool(isScuu)) { @@ -403,7 +403,7 @@ int32_t DisplayPowerMgrStub::GetDeviceBrightnessStub(MessageParcel& data, Messag { uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); uint32_t ret = GetDeviceBrightness(displayId); if (!reply.WriteUint32(ret)) { @@ -418,8 +418,8 @@ int32_t DisplayPowerMgrStub::SetCoordinatedStub(MessageParcel& data, MessageParc bool coordinated = false; uint32_t displayId = 0; - READ_PARCEL_WITH_RET(data, Bool, coordinated, E_READ_PARCEL_ERROR); - READ_PARCEL_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Bool, coordinated, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Uint32, displayId, E_READ_PARCEL_ERROR); bool ret = SetCoordinated(coordinated, displayId); if (!reply.WriteBool(ret)) { @@ -432,7 +432,7 @@ int32_t DisplayPowerMgrStub::SetCoordinatedStub(MessageParcel& data, MessageParc int32_t DisplayPowerMgrStub::SetLightBrightnessThresholdStub(MessageParcel& data, MessageParcel& reply) { std::vector threshold; - READ_PARCEL_WITH_RET(data, Int32Vector, &threshold, E_READ_PARCEL_ERROR); + RETURN_IF_READ_PARCEL_FAILED_WITH_RET(data, Int32Vector, &threshold, E_READ_PARCEL_ERROR); sptr obj = data.ReadRemoteObject(); RETURN_IF_WITH_RET((obj == nullptr), E_READ_PARCEL_ERROR); sptr callback = iface_cast(obj); diff --git a/state_manager/utils/native/include/display_common.h b/state_manager/utils/native/include/display_common.h index d74c184..4055b6d 100644 --- a/state_manager/utils/native/include/display_common.h +++ b/state_manager/utils/native/include/display_common.h @@ -34,7 +34,7 @@ namespace DisplayMgr { } \ } while (0) \ -#define READ_PARCEL_NO_RET(parcel, type, out) \ +#define RETURN_IF_READ_PARCEL_FAILED_NO_RET(parcel, type, out) \ do { \ if (!(parcel).Read##type(out)) { \ DISPLAY_HILOGE(COMP_UTS, "%{public}s read "#out" failed", __func__); \ @@ -42,7 +42,7 @@ namespace DisplayMgr { } \ } while (0) \ -#define WRITE_PARCEL_NO_RET(parcel, type, data) \ +#define RETURN_IF_WRITE_PARCEL_FAILED_NO_RET(parcel, type, data) \ do { \ if (!(parcel).Write##type(data)) { \ DISPLAY_HILOGE(COMP_UTS, "%{public}s write "#data" failed", __func__); \ @@ -50,7 +50,7 @@ namespace DisplayMgr { } \ } while (0) \ -#define READ_PARCEL_WITH_RET(parcel, type, out, retval) \ +#define RETURN_IF_READ_PARCEL_FAILED_WITH_RET(parcel, type, out, retval) \ do { \ if (!(parcel).Read##type(out)) { \ DISPLAY_HILOGE(COMP_UTS, "%{public}s read "#out" failed", __func__); \ @@ -58,7 +58,7 @@ namespace DisplayMgr { } \ } while (0) \ -#define WRITE_PARCEL_WITH_RET(parcel, type, data, retval) \ +#define RETURN_IF_WRITE_PARCEL_FAILED_WITH_RET(parcel, type, data, retval) \ do { \ if (!(parcel).Write##type(data)) { \ DISPLAY_HILOGE(COMP_UTS, "%{public}s write "#data" failed", __func__); \ -- Gitee