Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-03 22:20:31 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

libc/hex2bin: Handle the line ending(\r, \n and \r\n) dynamically

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2021-11-17 03:02:36 +08:00
committed by Alan Carvalho de Assis
parent 3b69d09c80
commit c1cb429a98
2 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/hex2bin.h
-28
View File
@@ -36,34 +36,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Some environments may return CR as end-of-line, others LF, and others
* both. If not specified, the logic here assumes either (but not both) as
* the default.
*/
#if defined(CONFIG_EOL_IS_CR)
# undef CONFIG_EOL_IS_LF
# undef CONFIG_EOL_IS_BOTH_CRLF
# undef CONFIG_EOL_IS_EITHER_CRLF
#elif defined(CONFIG_EOL_IS_LF)
# undef CONFIG_EOL_IS_CR
# undef CONFIG_EOL_IS_BOTH_CRLF
# undef CONFIG_EOL_IS_EITHER_CRLF
#elif defined(CONFIG_EOL_IS_BOTH_CRLF)
# undef CONFIG_EOL_IS_CR
# undef CONFIG_EOL_IS_LF
# undef CONFIG_EOL_IS_EITHER_CRLF
#elif defined(CONFIG_EOL_IS_EITHER_CRLF)
# undef CONFIG_EOL_IS_CR
# undef CONFIG_EOL_IS_LF
# undef CONFIG_EOL_IS_BOTH_CRLF
#else
# undef CONFIG_EOL_IS_CR
# undef CONFIG_EOL_IS_LF
# undef CONFIG_EOL_IS_BOTH_CRLF
# define CONFIG_EOL_IS_EITHER_CRLF 1
#endif
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
libs/libc/hex2bin/lib_hex2bin.c
-27
View File
@@ -264,38 +264,11 @@ static int readstream(FAR struct lib_instream_s *instream,
while (ch != EOF && nbytes < (MAXRECORD_ASCSIZE - 1)) while (ch != EOF && nbytes < (MAXRECORD_ASCSIZE - 1))
{ {
#if defined(CONFIG_EOL_IS_LF)
if (ch == '\n')
{
*line = '\0';
return nbytes;
}
#elif defined(CONFIG_EOL_IS_BOTH_CRLF)
if (ch == '\r')
{
continue;
}
else if (ch == '\n')
{
*line = '\0';
return nbytes;
}
#elif defined(CONFIG_EOL_IS_CR)
if (ch == '\r')
{
*line = '\0';
return nbytes;
}
#elif defined(CONFIG_EOL_IS_EITHER_CRLF)
if (ch == '\n' || ch == '\r') if (ch == '\n' || ch == '\r')
{ {
*line = '\0'; *line = '\0';
return nbytes; return nbytes;
} }
#endif
/* Only hex data goes into the line buffer */ /* Only hex data goes into the line buffer */