diff --git a/frameworks/bundle_lite/include/aafwk_product_adapter.h b/frameworks/bundle_lite/include/aafwk_product_adapter.h index 3c852b4..b125c50 100644 --- a/frameworks/bundle_lite/include/aafwk_product_adapter.h +++ b/frameworks/bundle_lite/include/aafwk_product_adapter.h @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifndef AAFWK_PRODUCT_ADAPTER_H #define AAFWK_PRODUCT_ADAPTER_H +#define AAFWK_PRODUCT_ADAPTER_H #define AAFWK_PRODUCT_ADAPTER_H #include @@ -43,3 +45,4 @@ public: static void PrintErrCode(uint8_t info2, uint16_t rfu); }; } // namespace OHOS +#endif \ No newline at end of file diff --git a/utils/bundle_lite/aafwk_event_error_code.cpp b/utils/bundle_lite/aafwk_event_error_code.cpp index 7609a60..ece42dc 100644 --- a/utils/bundle_lite/aafwk_event_error_code.cpp +++ b/utils/bundle_lite/aafwk_event_error_code.cpp @@ -17,23 +17,23 @@ #include "aafwk_product_adapter.h" namespace OHOS { -AafwkEventCodePrint *AafwkEventCodePrint::GetInstance() +AafwkEventErrorCode *AafwkEventErrorCode::GetInstance() { - static AafwkEventCodePrint printInstance; + static AafwkEventErrorCode printInstance; return &printInstance; } -void AafwkEventCodePrint::AafwkEventPrint(uint8_t info2, uint8_t info3) +void AafwkEventErrorCode::AafwkEventPrint(uint8_t info2, uint8_t info3) { AafwkProductAdapter::PrintEventTrace(0, info2, info3); } -void AafwkEventCodePrint::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) +void AafwkEventErrorCode::AafwkEventPrint(uint8_t info1, uint8_t info2, uint8_t info3) { AafwkProductAdapter::PrintEventTrace(info1, info2, info3); } -void AafwkEventCodePrint::AafwkErrorPrint(uint8_t info1, uint16_t info2) +void AafwkEventErrorCode::AafwkErrorPrint(uint8_t info1, uint16_t info2) { AafwkProductAdapter::PrintErrCode(info1, info2); } diff --git a/utils/bundle_lite/aafwk_event_error_code.h b/utils/bundle_lite/aafwk_event_error_code.h index 37b5bf4..b7d68ca 100644 --- a/utils/bundle_lite/aafwk_event_error_code.h +++ b/utils/bundle_lite/aafwk_event_error_code.h @@ -18,18 +18,18 @@ namespace OHOS { #define APP_EVENT(code1) \ - AafwkEventCodePrint::GetInstance()->AafwkEventPrint(code1, 0) + AafwkEventErrorCode::GetInstance()->AafwkEventPrint(code1, 0) #define APP_ERRCODE_EXTRA(code1, code2) \ - AafwkEventCodePrint::GetInstance()->AafwkErrorPrint(code1, code2) + AafwkEventErrorCode::GetInstance()->AafwkErrorPrint(code1, code2) -class AafwkEventCodePrint { +class AafwkEventErrorCode { public: - AafwkEventCodePrint() = default; + AafwkEventErrorCode() = default; - ~AafwkEventCodePrint() = default; + ~AafwkEventErrorCode() = default; - static AafwkEventCodePrint *GetInstance(); + static AafwkEventErrorCode *GetInstance(); void AafwkEventPrint(uint8_t info2, uint8_t info3);