Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
红岛
rt-thread
提交
6a12704b
R
rt-thread
项目概览
红岛
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6a12704b
编写于
3月 10, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
3月 10, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2412 from armink/fix_ulog
Update the ulog
上级
1cf890c1
58459307
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
3 deletion
+10
-3
components/utilities/ulog/ulog.c
components/utilities/ulog/ulog.c
+4
-1
include/rtdbg.h
include/rtdbg.h
+1
-1
include/rtthread.h
include/rtthread.h
+1
-0
src/kservice.c
src/kservice.c
+4
-1
未找到文件。
components/utilities/ulog/ulog.c
浏览文件 @
6a12704b
...
...
@@ -315,7 +315,10 @@ RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *ta
/* is not in interrupt context */
if
(
rt_interrupt_get_nest
()
==
0
)
{
log_len
+=
ulog_strcpy
(
log_len
,
log_buf
+
log_len
,
rt_thread_self
()
->
name
);
rt_size_t
name_len
=
rt_strnlen
(
rt_thread_self
()
->
name
,
RT_NAME_MAX
);
rt_strncpy
(
log_buf
+
log_len
,
rt_thread_self
()
->
name
,
name_len
);
log_len
+=
name_len
;
}
else
{
...
...
include/rtdbg.h
浏览文件 @
6a12704b
...
...
@@ -42,7 +42,7 @@
#define DBG_COLOR
#endif
#if defined(RT_USING_ULOG)
&& defined(DBG_ENABLE)
#if defined(RT_USING_ULOG)
/* using ulog compatible with rtdbg */
#include <ulog.h>
#else
...
...
include/rtthread.h
浏览文件 @
6a12704b
...
...
@@ -516,6 +516,7 @@ void *rt_memcpy(void *dest, const void *src, rt_ubase_t n);
rt_int32_t
rt_strncmp
(
const
char
*
cs
,
const
char
*
ct
,
rt_ubase_t
count
);
rt_int32_t
rt_strcmp
(
const
char
*
cs
,
const
char
*
ct
);
rt_size_t
rt_strlen
(
const
char
*
src
);
rt_size_t
rt_strnlen
(
const
char
*
s
,
rt_ubase_t
maxlen
);
char
*
rt_strdup
(
const
char
*
s
);
#if defined(__CC_ARM) || defined(__CLANG_ARM)
/* leak strdup interface */
...
...
src/kservice.c
浏览文件 @
6a12704b
...
...
@@ -461,6 +461,7 @@ rt_int32_t rt_strcmp(const char *cs, const char *ct)
return
(
*
cs
-
*
ct
);
}
RTM_EXPORT
(
rt_strcmp
);
/**
* The strnlen() function returns the number of characters in the
* string pointed to by s, excluding the terminating null byte ('\0'),
...
...
@@ -476,11 +477,13 @@ rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen)
{
const
char
*
sc
;
for
(
sc
=
s
;
*
sc
!=
'\0'
&&
sc
-
s
<
(
int
)
maxlen
;
++
sc
)
/* nothing */
for
(
sc
=
s
;
*
sc
!=
'\0'
&&
(
rt_ubase_t
)(
sc
-
s
)
<
maxlen
;
++
sc
)
/* nothing */
;
return
sc
-
s
;
}
RTM_EXPORT
(
rt_strnlen
);
/**
* This function will return the length of a string, which terminate will
* null character.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录