From 976131dc4c8629e7e6d8877448e015daaf7d0e29 Mon Sep 17 00:00:00 2001 From: limerence Date: Tue, 28 Nov 2023 11:20:28 +0800 Subject: [PATCH] =?UTF-8?q?owneridi=E7=9B=B8=E5=85=B3=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BD=93=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: limerence --- .../code_sign_attr_utils/include/code_sign_attr_utils.h | 4 ++-- test/unittest/utils/src/xpm_common.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h b/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h index 232636a..f7d63f2 100755 --- a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h +++ b/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h @@ -30,7 +30,7 @@ extern "C" { #define OWNERID_SHARED_TAG "SHARED_LIB_ID" #define OWNERID_COMPAT_TAG "COMPAT_LIB_ID" -enum file_ownerid_type { +enum FileOwneridType { FILE_OWNERID_UNINT = 0, FILE_OWNERID_SYSTEM, FILE_OWNERID_APP, @@ -41,7 +41,7 @@ enum file_ownerid_type { }; /* process and file ownerid types need to correspond to each other */ -enum process_ownerid_type { +enum ProcessOwneridType { PROCESS_OWNERID_UNINIT = FILE_OWNERID_UNINT, PROCESS_OWNERID_SYSTEM = FILE_OWNERID_SYSTEM, PROCESS_OWNERID_APP = FILE_OWNERID_APP, diff --git a/test/unittest/utils/src/xpm_common.cpp b/test/unittest/utils/src/xpm_common.cpp index ccf46b7..c4c395d 100644 --- a/test/unittest/utils/src/xpm_common.cpp +++ b/test/unittest/utils/src/xpm_common.cpp @@ -56,14 +56,14 @@ static int GetXpmRegion(struct XpmRegionArea &area) return -1; } - char xpm_region[XPM_PROC_LENGTH] = {0}; - int ret = read(fd, xpm_region, sizeof(xpm_region)); + char xpmRegion[XPM_PROC_LENGTH] = {0}; + int ret = read(fd, xpmRegion, sizeof(xpmRegion)); if (ret < 0) { LOG_ERROR(LABEL, "read xpm proc file failed(%{public}s)", strerror(errno)); return -1; } - ret = sscanf_s(xpm_region, "%llx-%llx", &area.start, &area.end); + ret = sscanf_s(xpmRegion, "%llx-%llx", &area.start, &area.end); if (ret < 0) { LOG_ERROR(LABEL, "sscanf xpm region string failed(%{public}s)", strerror(errno)); return -1; -- Gitee