openharmony/drivers_adapter_khdf_linux
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_adapter_khdf_linux.git synced 2026-07-19 16:43:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: modify the review problem of osal log

Browse Source 
Signed-off-by: zhang <zhangfengxi@huawei.com>
This commit is contained in:
zhang
2022-03-24 15:55:39 +08:00
parent 4dc1ab299d
commit 4784b156b5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osal/src/osal_deal_log_format.c
+3 -1
View File
@@ -23,6 +23,7 @@
static const char *g_property[NUMBER] = {"%{private}", "%{public}"};
static size_t g_property_len[NUMBER] = {10, 9};
/* remove "{private}" and "{public}" from fmt and copy to dest */
bool deal_format(const char *fmt, char *dest, size_t size)
{
const char *ptr = fmt;
@@ -31,7 +32,7 @@ bool deal_format(const char *fmt, char *dest, size_t size)
size_t index = 0;
size_t i;
if (fmt == NULL || dest == NULL || size == 0) {
if (fmt == NULL || dest == NULL || size == 0 || strlen(fmt) >= (size - 1)) {
printk("%s invalid para", __func__);
return false;
}
@@ -40,6 +41,7 @@ bool deal_format(const char *fmt, char *dest, size_t size)
if (*ptr_cur == '%') {
for (i = 0; i < NUMBER; i++) {
if (strncmp(ptr_cur, g_property[i], g_property_len[i]) == 0) {
/* add 1 is for to copy char '%' */
ret = strncpy_s(&dest[index], size - index, ptr, ptr_cur - ptr + 1);
if (ret != EOK) {
printk("%s strncpy_s error %d", __func__, ret);