summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbernard <[email protected]>2013-10-10 00:22:59 +0900
committerbernard <[email protected]>2013-10-10 00:22:59 +0900
commit1ffb99e6f58d2ba8d9e0f0cfba2bbb158c0ecee7 (patch)
treec5e438f5db85072b981923d64572cdb763ca4372 /src
parentf1107f6714a2d6e53f94c957fb352846407c56f9 (diff)
parent83bb05419f7aba80f6a10a48f88a2838a356737a (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'src')
-rw-r--r--src/kservice.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/kservice.c b/src/kservice.c
index ff5ff9de2a..c2fa43ba73 100644
--- a/src/kservice.c
+++ b/src/kservice.c
@@ -718,10 +718,10 @@ static char *print_number(char *buf,
return buf;
}
-static rt_int32_t vsnprintf(char *buf,
- rt_size_t size,
- const char *fmt,
- va_list args)
+rt_int32_t rt_vsnprintf(char *buf,
+ rt_size_t size,
+ const char *fmt,
+ va_list args)
{
#ifdef RT_PRINTF_LONGLONG
unsigned long long num;
@@ -976,6 +976,7 @@ static rt_int32_t vsnprintf(char *buf,
*/
return str - buf;
}
+RTM_EXPORT(rt_vsnprintf);
/**
* This function will fill a formatted string to buffer
@@ -990,7 +991,7 @@ rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *fmt, ...)
va_list args;
va_start(args, fmt);
- n = vsnprintf(buf, size, fmt, args);
+ n = rt_vsnprintf(buf, size, fmt, args);
va_end(args);
return n;
@@ -1006,7 +1007,7 @@ RTM_EXPORT(rt_snprintf);
*/
rt_int32_t rt_vsprintf(char *buf, const char *format, va_list arg_ptr)
{
- return vsnprintf(buf, (rt_size_t) -1, format, arg_ptr);
+ return rt_vsnprintf(buf, (rt_size_t) -1, format, arg_ptr);
}
RTM_EXPORT(rt_vsprintf);
@@ -1114,7 +1115,7 @@ void rt_kprintf(const char *fmt, ...)
* large excluding the terminating null byte. If the output string
* would be larger than the rt_log_buf, we have to adjust the output
* length. */
- length = vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
+ length = rt_vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
if (length > RT_CONSOLEBUF_SIZE - 1)
length = RT_CONSOLEBUF_SIZE - 1;
#ifdef RT_USING_DEVICE