libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

remove rt_strlcpy function. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@499 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-03-17 04:19:17 +00:00
parent ce36652552
commit 5e2bb92cda
1 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/kservice.c
View File

@ -12,6 +12,8 @@
* 2006-03-16 Bernard the first version
* 2006-05-25 Bernard rewrite vsprintf
* 2006-08-10 Bernard add rt_show_version
* 2010-03-17 Bernard remove rt_strlcpy function
* fix gcc compiling issue.
*/
#include <rtthread.h>
@ -28,6 +30,7 @@ int errno;
#else
#include <errno.h>
#endif
static rt_device_t _console_device = RT_NULL;
/*
* This function will get errno
@ -335,26 +338,6 @@ char *rt_strncpy(char *dest, const char *src, rt_ubase_t n)
return dest;
}
/**
* This function will copy string no more than n bytes.
*
* @param dest the string to copy
* @param src the string to be copied
* @param n the maximum copied length
*
* @return the result with '\0' at the end
*/
char *rt_strlcpy(char *dest, const char *src, rt_ubase_t n)
{
char *tmp = (char *) dest, *s = (char *) src;
while(n--)
*tmp++ = *s++;
*tmp = '\0';
return dest;
}
/**
* This function will compare two strings with specified maximum length
*
@ -423,7 +406,7 @@ void rt_show_version()
{
rt_kprintf("\n \\ | /\n");
rt_kprintf("- RT - Thread Operating System\n");
rt_kprintf(" / | \\ 0.%d.%d build %s %s\n", RT_VERSION, RT_SUBVERSION, __DATE__, __TIME__);
rt_kprintf(" / | \\ 0.%d.%d build %s\n", RT_VERSION, RT_SUBVERSION, __DATE__);
rt_kprintf(" 2006 - 2009 Copyright by rt-thread team\n");
}
@ -902,8 +885,7 @@ rt_int32_t rt_sprintf(char *buf ,const char *format,...)
return n;
}
static rt_device_t _console_device = RT_NULL;
/**
* This function will set console to a device.
* After set a device to console, all output of rt_kprintf will be
@ -936,14 +918,17 @@ rt_device_t rt_console_set_device(const char* name)
}
return old;
}
}
#if defined(__GNUC__)
void __attribute__((weak)) rt_hw_console_output(const char* str)
#elif defined(__CC_ARM)
__weak void rt_hw_console_output(const char* str)
#elif defined(__ICCARM__)
__weak void rt_hw_console_output(const char* str)
void rt_hw_console_output(const char* str) __attribute__((weak));
void rt_hw_console_output(const char* str)
#elif defined(__CC_ARM)
__weak void rt_hw_console_output(const char* str)
#elif defined(__ICCARM__)
__weak void rt_hw_console_output(const char* str)
#endif
{
/* empty console output */
@ -957,8 +942,8 @@ __weak void rt_hw_console_output(const char* str)
void rt_kprintf(const char *fmt, ...)
{
va_list args;
rt_size_t length;
static char rt_log_buf[RT_CONSOLEBUF_SIZE];
rt_size_t length;
static char rt_log_buf[RT_CONSOLEBUF_SIZE];
va_start(args, fmt);
@ -966,10 +951,10 @@ void rt_kprintf(const char *fmt, ...)
if (_console_device == RT_NULL)
{
rt_hw_console_output(rt_log_buf);
}
else
{
rt_device_write(_console_device, 0, rt_log_buf, length);
}
else
{
rt_device_write(_console_device, 0, rt_log_buf, length);
}
va_end(args);