From b06520ac7c19c1f804746e3a1bb22b7e0357f524 Mon Sep 17 00:00:00 2001
From: wangchen <253227059@qq.com>
Date: Thu, 17 Mar 2022 11:47:31 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E6=A0=B8=E5=86=85=E6=BA=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【背景】内源代码检视问题

【修改方案】
1，按检视意见，进行拼写等问题的修改

【影响】
对现有的产品编译不会有影响。

Signed-off-by: wangchen <wangchen64@huawei.com>
---
 kernel/base/mem/membox/los_membox.c | 2 +-
 kernel/base/mem/tlsf/los_memory.c   | 6 +++---
 kernel/base/mp/los_lockdep.c        | 4 ++--
 kernel/include/los_membox.h         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/base/mem/membox/los_membox.c b/kernel/base/mem/membox/los_membox.c
index cbc48c27..7a4b66de 100644
--- a/kernel/base/mem/membox/los_membox.c
+++ b/kernel/base/mem/membox/los_membox.c
@@ -93,7 +93,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_MemboxInit(VOID *pool, UINT32 poolSize, UINT32
     }
 
     MEMBOX_LOCK(intSave);
-    boxInfo->uwBlkSize = LOS_MEMBOX_ALLIGNED(blkSize + OS_MEMBOX_NODE_HEAD_SIZE);
+    boxInfo->uwBlkSize = LOS_MEMBOX_ALIGNED(blkSize + OS_MEMBOX_NODE_HEAD_SIZE);
     boxInfo->uwBlkNum = (poolSize - sizeof(LOS_MEMBOX_INFO)) / boxInfo->uwBlkSize;
     boxInfo->uwBlkCnt = 0;
     if (boxInfo->uwBlkNum == 0) {
diff --git a/kernel/base/mem/tlsf/los_memory.c b/kernel/base/mem/tlsf/los_memory.c
index 05c02598..7f6ea21a 100644
--- a/kernel/base/mem/tlsf/los_memory.c
+++ b/kernel/base/mem/tlsf/los_memory.c
@@ -169,7 +169,7 @@ struct OsMemPoolHead {
 
 /* The memory pool support expand. */
 #define OS_MEM_POOL_EXPAND_ENABLE  0x01
-/* The memory pool ssupport no lock. */
+/* The memory pool support no lock. */
 #define OS_MEM_POOL_LOCK_ENABLE    0x02
 
 #define OS_MEM_NODE_MAGIC        0xABCDDCBA
@@ -486,7 +486,7 @@ STATIC INLINE VOID OsLmsAllocAlignMark(VOID *ptr, VOID *alignedPtr, UINT32 size)
         g_lms->simpleMark((UINTPTR)ptr + sizeof(UINT32), (UINTPTR)alignedPtr, LMS_SHADOW_REDZONE_U8);
     }
 
-    /* mark remining as redzone */
+    /* mark remaining as redzone */
     g_lms->simpleMark(LMS_ADDR_ALIGN((UINTPTR)alignedPtr + size), (UINTPTR)OS_MEM_NEXT_NODE(allocNode),
         LMS_SHADOW_REDZONE_U8);
 }
@@ -1804,7 +1804,7 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
               tmpNode, preNode, taskCB->taskName);
 #else
     MEM_UNLOCK(pool, intSave);
-    LOS_Panic("Memory interity check error, cur node: %#x, pre node: %#x\n", tmpNode, preNode);
+    LOS_Panic("Memory integrity check error, cur node: %#x, pre node: %#x\n", tmpNode, preNode);
 #endif
 }
 
diff --git a/kernel/base/mp/los_lockdep.c b/kernel/base/mp/los_lockdep.c
index 24e6b301..65e5f2f8 100644
--- a/kernel/base/mp/los_lockdep.c
+++ b/kernel/base/mp/los_lockdep.c
@@ -165,7 +165,7 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock,
     }
 }
 
-STATIC BOOL OsLockDepCheckDependancy(const LosTaskCB *current, LosTaskCB *lockOwner)
+STATIC BOOL OsLockDepCheckDependency(const LosTaskCB *current, LosTaskCB *lockOwner)
 {
     BOOL checkResult = TRUE;
     SPIN_LOCK_S *lockTemp = NULL;
@@ -217,7 +217,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
         goto OUT;
     }
 
-    if (OsLockDepCheckDependancy(current, lockOwner) != TRUE) {
+    if (OsLockDepCheckDependency(current, lockOwner) != TRUE) {
         checkResult = LOCKDEP_ERR_DEAD_LOCK;
         goto OUT;
     }
diff --git a/kernel/include/los_membox.h b/kernel/include/los_membox.h
index 9d58cdd5..94c7c4d6 100644
--- a/kernel/include/los_membox.h
+++ b/kernel/include/los_membox.h
@@ -74,14 +74,14 @@ typedef LOS_MEMBOX_INFO OS_MEMBOX_S;
  * @ingroup los_membox
  * Memory pool alignment
  */
-#define LOS_MEMBOX_ALLIGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1)))
+#define LOS_MEMBOX_ALIGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1)))
 
 /**
  * @ingroup los_membox
  * Memory pool size
  */
 #define LOS_MEMBOX_SIZE(blkSize, blkNum) \
-    (sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_ALLIGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum)))
+    (sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_ALIGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum)))
 
 /**
  * @ingroup los_membox
-- 
GitLab