!641 fix: 规范整改

Merge pull request !641 from zhushengle/sample

arch/arm/arm9/gcc/los_interrupt.c

@@ -163,7 +163,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m3/keil/los_interrupt.c

@@ -40,10 +40,8 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
 #ifdef __ICCARM__
 #pragma location = ".data.vector"
 #elif defined(__CC_ARM) || defined(__GNUC__)
@@ -198,7 +196,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c

@@ -41,10 +41,8 @@
 #include "los_membox.h"
 
 #define DEF_HANDLER_START_INDEX 2
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
 
 /* *
  * @ingroup los_hwi
@@ -189,7 +187,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c

@@ -41,11 +41,8 @@
 #include "los_membox.h"
 
 #define DEF_HANDLER_START_INDEX 2
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
-
 /* *
  * @ingroup los_hwi
  * Hardware interrupt form mapping handling function array.

arch/arm/cortex-m4/gcc/los_interrupt.c

@@ -40,11 +40,8 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
-
 /* *
  * @ingroup los_hwi
  * Hardware interrupt form mapping handling function array.
@@ -193,7 +190,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m4/iar/los_interrupt.c

@@ -41,10 +41,8 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
 #ifdef __ICCARM__
 #pragma location = ".data.vector"
 #pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN

arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c

@@ -40,10 +40,8 @@
 #include "los_membox.h"
 
 #define DEF_HANDLER_START_INDEX 2
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
 
 /* *
  * @ingroup los_hwi
@@ -193,7 +191,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m7/gcc/los_interrupt.c

@@ -40,11 +40,8 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
-
 /* *
  * @ingroup los_hwi
  * Hardware interrupt form mapping handling function array.
@@ -188,7 +185,6 @@ inline UINT32 ArchIsIntActive(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-/*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
     PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());

arch/arm/cortex-m7/iar/los_interrupt.c

@@ -41,10 +41,8 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-/*lint -save -e40 -e522 -e533*/
 UINT32 g_intCount = 0;
 
-/*lint -restore*/
 #pragma location = ".data.vector"
 #pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
 /* *

components/exchook/los_exc_info.c

@@ -55,7 +55,7 @@ STATIC ExcInfoArray g_excArray[OS_EXC_TYPE_MAX];
 
 STATIC UINT32 OsExcSaveIntStatus(UINT32 type, VOID *arg)
 {
-    UINT32 ret;
+    errno_t ret;
     UINTPTR excContentEnd = (UINTPTR)MAX_INT_INFO_SIZE + (UINTPTR)g_excContent;
 
     (VOID)arg;

components/fs/vfs/vfs_fs.c

@@ -1191,7 +1191,7 @@ int LOS_Ioctl(int fd, int req, ...)
 ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
 {
     int i;
-    int ret;
+    errno_t ret;
     char *buf = NULL;
     char *curBuf = NULL;
     char *readBuf = NULL;
@@ -1231,7 +1231,7 @@ ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
 
         size_t lenToRead = totalLen < bytesToRead ? totalLen : bytesToRead;
         ret = memcpy_s(readBuf, bytesToRead, curBuf, lenToRead);
-        if (ret != LOS_OK) {
+        if (ret != EOK) {
             free(buf);
             return LOS_NOK;
         }
@@ -1248,7 +1248,7 @@ ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
 ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt)
 {
     int i;
-    int ret;
+    errno_t ret;
     char *buf = NULL;
     char *curBuf = NULL;
     char *writeBuf = NULL;
@@ -1285,7 +1285,7 @@ ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt)
             continue;
         }
         ret = memcpy_s(curBuf, totalLen, writeBuf, bytesToWrite);
-        if (ret != LOS_OK) {
+        if (ret != EOK) {
             free(buf);
             return LOS_NOK;
         }

components/net/lwip-2.1/enhancement/src/fixme.c

@@ -124,7 +124,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
     u16_t *a16 = (u16_t *)addr->addr;
     int squash_pos = ipv6_blocks;
     int i;
-    const char *sc = cp;
+    const unsigned char *sc = (const unsigned char *)cp;
     const char *ss = cp-1;
 
     for (; ; sc++) {

components/net/lwip-2.1/porting/src/api_shell.c

@@ -217,7 +217,6 @@ void lwip_ifconfig_show_internal(void *arg)
     sys_sem_signal(&ifconfig_cmd->cb_completed);
 }
 
-/*lint -e838 -e438*/
 u32_t lwip_ifconfig(int argc, const char **argv)
 {
     static struct ifconfig_option ifconfig_cmd;
@@ -252,7 +251,6 @@ u32_t lwip_ifconfig(int argc, const char **argv)
 
     return 0;
 }
-/*lint +e838 +e438*/
 
 #if LWIP_DNS
 #ifndef LWIP_TESTBED
@@ -278,7 +276,7 @@ struct hostent *gethostnameinfo(const char *host, char *tmphstbuf, size_t hstbuf
 LWIP_STATIC unsigned int get_hostip(const char *hname)
 {
     unsigned int ip = 0;
-    int ret;
+    errno_t ret;
     const size_t hstbuflen = 1024;
     char *tmphstbuf = NULL;
 
@@ -292,7 +290,7 @@ LWIP_STATIC unsigned int get_hostip(const char *hname)
         return 0;
     }
     ret = memcpy_s(&ip, sizeof(ip), pent->h_addr, 4);
-    if (ret != 0) {
+    if (ret != EOK) {
         free(tmphstbuf);
         return 0;
     }

components/net/lwip-2.1/porting/src/driverif.c

@@ -34,8 +34,6 @@
 #include <lwip/snmp.h>
 #include <lwip/etharp.h>
 #include <lwip/sockets.h>
-#include <lwip/snmp.h>
-#include <lwip/etharp.h>
 #include <lwip/ethip6.h>
 
 #define LWIP_NETIF_HOSTNAME_DEFAULT         "default"

components/net/lwip-2.1/porting/src/sys_arch.c

@@ -33,7 +33,6 @@
 #include <lwip/sys.h>
 #include <lwip/debug.h>
 #include <los_task.h>
-#include <los_tick.h>
 #include <los_queue.h>
 #include <los_sem.h>
 #include <los_mux.h>
@@ -202,6 +201,8 @@ err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
 
 err_t sys_mbox_trypost_fromisr(sys_mbox_t *mbox, void *msg)
 {
+    (void)mbox;
+    (void)msg;
     return ERR_ARG;
 }
 

components/net/test/net_socket_test_011.c

@@ -217,7 +217,6 @@ static void ParsePackageIpUdp(struct netif *netif, struct pbuf *btBuf)
     ICUNIT_ASSERT_EQUAL(dataLen, strlen(MSG), 4);
     LogPrintln("=================================");
 
-    // 回应udp报文
     ReplayUdpTask();
 }
 
@@ -229,7 +228,6 @@ static void ParsePackageEthernet(struct netif *netif, struct pbuf *p)
     ethhdr = (struct eth_hdr *)p->payload;
     u16_t type = ethhdr->type;
 
-    LogPrintln("ParsePackageEthernet type is %d", type);
     switch (type) {
 #if LWIP_IPV4 && LWIP_ARP
         /* IP packet? */
@@ -322,7 +320,6 @@ static void UdpTestNetifTask(void *p)
     struct ifreq nif;
     int ret;
 
-    // 注册网卡
     btProxyNf = CreateBtNetIf();
 
     /* socket creation */
@@ -335,7 +332,6 @@ static void UdpTestNetifTask(void *p)
     ret = bind(sfd, (struct sockaddr*)&srvAddr, sizeof(srvAddr));
     LWIP_ASSERT("socket invalid param.", ret == 0);
 
-    /* 指定网卡接口 */
     char *inface = NETIF_NAME_BT;
     (void)strcpy_s(nif.ifr_name, sizeof(nif.ifr_name), inface);
     if (setsockopt(sfd, SOL_SOCKET, SO_BINDTODEVICE, (char *)&nif, sizeof(nif)) < 0) {
@@ -393,7 +389,6 @@ static void ArpPackageProc(struct netif *netif, struct pbuf *p)
         return;
     }
 
-    // 回应arp报文
     ReplayArpTask();
 }
 

components/shell/src/base/shcmd.c

@@ -98,6 +98,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsCmdKeyShift(const CHAR *cmdKey, CHAR *cmdOut, UI
         PRINTK("malloc failure in %s[%d]", __FUNCTION__, __LINE__);
         return (UINT32)OS_ERROR;
     }
+    (VOID)memset_s(output, len + 1, 0, len + 1);
     /* Backup the 'output' start address */
     outputBak = output;
     /* Scan each charactor in 'cmdKey',and squeeze the overmuch space and ignore invaild charactor */

components/trace/los_trace.h

@@ -304,9 +304,9 @@ extern TRACE_EVENT_HOOK g_traceEventHook;
  * <li>The first param is treat as key, keep at least this param if you want trace this event.</li>
  * <li>All parameters were treated as UINTPTR.</li>
  * </ul>
- * eg. Trace a event as:
+ * eg. Trace an event as:
  * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio) taskId, taskStatus, oldPrio, newPrio
- * eg. Not Trace a event as:
+ * eg. Not Trace an event as:
  * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio)
  * eg. Trace only you need parmas as:
  * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio) taskId

kal/posix/src/pthread_mutex.c

@@ -35,7 +35,6 @@
 #include "los_compiler.h"
 #include "los_mux.h"
 #include "errno.h"
-#include "los_mux.h"
 #include "los_debug.h"
 #include "los_hook.h"
 #include "los_sched.h"

kernel/src/los_queue.c

@@ -120,7 +120,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_QueueCreate(const CHAR *queueName,
 
     /* Memory allocation is time-consuming, to shorten the time of disable interrupt,
        move the memory allocation to here. */
-    queue = (UINT8 *)LOS_MemAlloc(m_aucSysMem0, len * msgSize);
+    queue = (UINT8 *)LOS_MemAlloc(m_aucSysMem0, (UINT32)len * msgSize);
     if (queue == NULL) {
         return LOS_ERRNO_QUEUE_CREATE_NO_MEMORY;
     }

testsuites/unittest/fuzz/src/socket/net_fuzz.c

@@ -303,7 +303,7 @@ static UINT32 TcpFun(VOID)
             stTask1.uwResved = LOS_TASK_STATUS_DETACHED;
             (void)LOS_TaskCreate(&g_testTaskID01, &stTask1);
         }
-    };
+    }
 
     DT_Clear(g_element);
     CLOSE_Log();

testsuites/unittest/fuzz/src/stdlib/realloc_fuzz.c

@@ -57,6 +57,8 @@ void ReallocFuzzTest(void)
         return;
     }
 
+    (void)memset_s(source, TEST_BUF_LEN, 0, TEST_BUF_LEN);
+
     INIT_FuzzEnvironment();
     CreatPrecondForQueue();
     for (int i = 0; i < CYCLE_TOTAL_TIMES; i++) {

testsuites/unittest/posix/src/string/memory_func_test.c

@@ -268,7 +268,7 @@ LITE_TEST_CASE(PosixMemFuncTestSuite, testOsMemRealloc001, Function | MediumTest
         mem = malloc(mlen);
         TEST_ASSERT_NOT_NULL(mem);
 
-        memset(mem, testChar, mlen);
+        (void)memset_s(mem, mlen, testChar, mlen);
         rlen = rand() % (1024) + mlen;
         char *mem1 = realloc(mem, rlen);
         if (mem1 == NULL) {

utils/los_list.h

@@ -248,7 +248,7 @@ LITE_OS_SEC_ALW_INLINE STATIC_INLINE BOOL LOS_ListEmpty(LOS_DL_LIST *node)
  * <ul><li>los_list.h: the header file that contains the API declaration.</li></ul>
  * @see
  */
-#define LOS_OFF_SET_OF(type, member) ((UINT32)&(((type *)0)->member)) /*lint -e(413) */
+#define LOS_OFF_SET_OF(type, member) ((UINT32)&(((type *)0)->member))
 
 /**
  * @ingroup los_list