diff --git a/hievent/src/hiview_hievent.c b/hievent/src/hiview_hievent.c index 60e87072dc08c54d586ad913c4717bc76823d9e8..bbf5b60c9a547954e86f49e5581ec47473154659 100644 --- a/hievent/src/hiview_hievent.c +++ b/hievent/src/hiview_hievent.c @@ -445,7 +445,7 @@ static int HiviewHieventConvertString(struct HiviewHievent *event, char **pbuf) tmp = buf; /* fill eventid */ - tmplen = snprintf_s(tmp, len, len - 1, "eventid %d", event->eventid); + tmplen = snprintf_s(tmp, len, len - 1, "eventid %u", event->eventid); BUF_POINTER_FORWARD; /* fill the path */ diff --git a/tzdriver/include/tc_ns_log.h b/tzdriver/include/tc_ns_log.h index 460118291e184c1b02d606afe101333f7cc5324d..2785b66973d96a29bd7a808f452dc1af7f7b07e1 100644 --- a/tzdriver/include/tc_ns_log.h +++ b/tzdriver/include/tc_ns_log.h @@ -52,32 +52,32 @@ enum { #define tlogv(fmt, args...) \ do { \ if (TZ_DEBUG_VERBOSE >= TEE_LOG_MASK) \ - pr_info("(%i, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ + pr_info("(%u, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ } while (0) #define tlogd(fmt, args...) \ do { \ if (TZ_DEBUG_DEBUG >= TEE_LOG_MASK) \ - pr_info("(%i, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ + pr_info("(%u, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ } while (0) #define tlogi(fmt, args...) \ do { \ if (TZ_DEBUG_INFO >= TEE_LOG_MASK) \ - pr_info("(%i, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ + pr_info("(%u, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ } while (0) #define tlogw(fmt, args...) \ do { \ if (TZ_DEBUG_WARN >= TEE_LOG_MASK) \ - pr_warn("(%i, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ + pr_warn("(%u, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args); \ } while (0) #define tloge(fmt, args...) \ - pr_err("(%i, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args) + pr_err("(%u, %s)%s: " fmt, OsCurrTaskGet()->taskID, OsCurrTaskGet()->taskName, __func__, ## args) #endif diff --git a/tzdriver/src/mailbox_mempool.c b/tzdriver/src/mailbox_mempool.c index f13048cd32af006a2cececb4cbfd378eb7e1a962..abd46b49d197de6134e726ab3876bc5b2d241f13 100644 --- a/tzdriver/src/mailbox_mempool.c +++ b/tzdriver/src/mailbox_mempool.c @@ -73,7 +73,7 @@ static void MailboxShowStatus(void) mutex_lock(&g_mbLock); for (i = 0; i < MAILBOX_PAGE_MAX; i++) { if (g_mZone.pages[i].count) { - pr_info("page[%02d], order=%02d, count=%d\n", i, g_mZone.pages[i].order, g_mZone.pages[i].count); + pr_info("page[%02u], order=%02d, count=%u\n", i, g_mZone.pages[i].order, g_mZone.pages[i].count); used += (1UL << (uint32_t)g_mZone.pages[i].order); } } @@ -108,7 +108,7 @@ static void MailboxShowDetails(void) for (i = 0; i < MAILBOX_PAGE_MAX; i++) { if ((i % MB_SHOW_LINE) == 0) { PRINTK("\n"); - PRINTK("%04d-%04d:", i, i + MB_SHOW_LINE); + PRINTK("%04u-%04u:", i, i + MB_SHOW_LINE); } if (g_mZone.pages[i].count) { diff --git a/tzdriver/src/smc_smp.c b/tzdriver/src/smc_smp.c index 987da57ab4d6383c123e3be1a2d0e8c870af0114..4e869dbefdc868bfa7ac0b8887ace3cae97e2527 100644 --- a/tzdriver/src/smc_smp.c +++ b/tzdriver/src/smc_smp.c @@ -1561,7 +1561,7 @@ int SmcInitData(void) g_siqThread = KthreadRun(SiqThreadFn, NULL, 0, "siqthread/0"); if (unlikely(IS_ERR_OR_NULL(g_siqThread))) { - pr_err("couldn't create siqthread %ld\n", + pr_err("couldn't create siqthread %lu\n", PTR_ERR(g_siqThread)); ret = (int)PTR_ERR(g_siqThread); goto FREE_MEM; diff --git a/tzdriver/src/tc_client_sub_driver.c b/tzdriver/src/tc_client_sub_driver.c index f54d5f444bcc098a04630056af890e0947841927..8b796b3e7a3ec1785d5b1ff2c17d0593da450f07 100644 --- a/tzdriver/src/tc_client_sub_driver.c +++ b/tzdriver/src/tc_client_sub_driver.c @@ -591,7 +591,7 @@ int PackCaCert(char *caCert, const char *path, } messageSize = snprintf_s(caCert, BUF_MAX_SIZE - 1, - BUF_MAX_SIZE - 1, "%s%u", path, + BUF_MAX_SIZE - 1, "%s%d", path, uid); return messageSize; diff --git a/tzdriver/src/tz_spi_notify.c b/tzdriver/src/tz_spi_notify.c index 21a74486a9b873b9f54141b85baf77de0bc8983c..ca21d30a9375978ae04337c1f23b54ff1a2a3053 100644 --- a/tzdriver/src/tz_spi_notify.c +++ b/tzdriver/src/tz_spi_notify.c @@ -672,7 +672,7 @@ int TzSpiInit() irq = NUM_HAL_INTERRUPT_TEE_SPI_NOTIFY; int ret = DevmRequestIrq(irq, TcSecureNotify, IRQF_NO_SUSPEND, TC_NS_CLIENT_DEV, NULL); if (ret < 0) { - tloge("device irq %u request failed %u", irq, ret); + tloge("device irq %u request failed %d", irq, ret); goto clean; } ret = memset_s(&g_taCallbackFuncList, sizeof(g_taCallbackFuncList), 0, sizeof(g_taCallbackFuncList));