From 6991ec7c970d7349232edfece40835fe05eccb87 Mon Sep 17 00:00:00 2001 From: GongHui Date: Thu, 17 Sep 2020 09:01:28 +0800 Subject: [PATCH 1/2] Description:fix hcs parse inaccurate log --- ability/config/hcs_parser/src/hcs_blob_if.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ability/config/hcs_parser/src/hcs_blob_if.c b/ability/config/hcs_parser/src/hcs_blob_if.c index f4159e0f9..22db6fcaf 100755 --- a/ability/config/hcs_parser/src/hcs_blob_if.c +++ b/ability/config/hcs_parser/src/hcs_blob_if.c @@ -197,13 +197,11 @@ static bool CheckHcsBlobLength(const char *start, uint32_t length, struct HbcHea if (header->totalSize >= 0) { blobLength = HBC_HEADER_LENGTH + header->totalSize; g_byteAlign = false; - HDF_LOGE("%s: the blobLength: %u, byteAlign: %d, totalSize: %d", __func__, blobLength, - g_byteAlign, header->totalSize); + HDF_LOGI("%s: the blobLength: %u, byteAlign: %d", __func__, blobLength, g_byteAlign); } else { blobLength = HBC_HEADER_LENGTH - header->totalSize; g_byteAlign = true; - HDF_LOGE("%s: the blobLength: %u, byteAlign: %d, totalSize: %d", __func__, blobLength, - g_byteAlign, header->totalSize); + HDF_LOGI("%s: the blobLength: %u, byteAlign: %d", __func__, blobLength, g_byteAlign); } if ((length != blobLength) || (blobLength < minLength)) { HDF_LOGE("%s failed, Hcsblob file length is %u, But the length of calculation is %u", -- Gitee From b0e18ae4dc39a39f969b9c684f6e8b2a4a675c20 Mon Sep 17 00:00:00 2001 From: GongHui Date: Wed, 23 Sep 2020 19:20:41 +0800 Subject: [PATCH 2/2] format dos to unix --- utils/src/hdf_sref.c | 162 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/utils/src/hdf_sref.c b/utils/src/hdf_sref.c index c66083302..0ec4c8741 100755 --- a/utils/src/hdf_sref.c +++ b/utils/src/hdf_sref.c @@ -1,82 +1,82 @@ -/* - * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "hdf_sref.h" +/* + * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved. + * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "hdf_sref.h" #include "hdf_log.h" - -#define HDF_LOG_TAG hdf_sref - -void HdfSRefAcquire(struct HdfSRef *sref) -{ - int32_t lockRef; - if (sref == NULL) { - HDF_LOGE("Acquire input sref is null"); - return; - } - OsalAtomicInc(&sref->refs); - lockRef = OsalAtomicRead(&sref->refs); - if ((lockRef == 1) && (sref->listener != NULL)) { - struct IHdfSRefListener *listener = sref->listener; - if (listener->OnFirstAcquire != NULL) { - listener->OnFirstAcquire(sref); - } - } -} - -void HdfSRefRelease(struct HdfSRef *sref) -{ - int32_t lockRef; - if (sref == NULL) { - HDF_LOGE("Release input sref is null"); - return; - } - OsalAtomicDec(&sref->refs); - lockRef = OsalAtomicRead(&sref->refs); - if ((lockRef == 0) && (sref->listener != NULL)) { - struct IHdfSRefListener *listener = sref->listener; - if (listener->OnLastRelease != NULL) { - listener->OnLastRelease(sref); - } - } -} - -void HdfSRefConstruct(struct HdfSRef *sref, struct IHdfSRefListener *listener) -{ - if ((sref == NULL) || (listener == NULL)) { - HDF_LOGE("Input params is invalid"); - return; - } - OsalAtomicSet(&sref->refs, 0); - sref->listener = listener; - sref->Acquire = HdfSRefAcquire; - sref->Release = HdfSRefRelease; -} - + +#define HDF_LOG_TAG hdf_sref + +void HdfSRefAcquire(struct HdfSRef *sref) +{ + int32_t lockRef; + if (sref == NULL) { + HDF_LOGE("Acquire input sref is null"); + return; + } + OsalAtomicInc(&sref->refs); + lockRef = OsalAtomicRead(&sref->refs); + if ((lockRef == 1) && (sref->listener != NULL)) { + struct IHdfSRefListener *listener = sref->listener; + if (listener->OnFirstAcquire != NULL) { + listener->OnFirstAcquire(sref); + } + } +} + +void HdfSRefRelease(struct HdfSRef *sref) +{ + int32_t lockRef; + if (sref == NULL) { + HDF_LOGE("Release input sref is null"); + return; + } + OsalAtomicDec(&sref->refs); + lockRef = OsalAtomicRead(&sref->refs); + if ((lockRef == 0) && (sref->listener != NULL)) { + struct IHdfSRefListener *listener = sref->listener; + if (listener->OnLastRelease != NULL) { + listener->OnLastRelease(sref); + } + } +} + +void HdfSRefConstruct(struct HdfSRef *sref, struct IHdfSRefListener *listener) +{ + if ((sref == NULL) || (listener == NULL)) { + HDF_LOGE("Input params is invalid"); + return; + } + OsalAtomicSet(&sref->refs, 0); + sref->listener = listener; + sref->Acquire = HdfSRefAcquire; + sref->Release = HdfSRefRelease; +} + -- Gitee