You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/06/03 13:36:22 UTC
[incubator-nuttx] 02/02: libc: Call vdprintf in printf/vprintf for
CONFIG_NFILE_STREAMS == 0
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 29f9d9742029cc11c87e1d84782c8beef0ad0445
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Jun 3 02:46:05 2020 +0800
libc: Call vdprintf in printf/vprintf for CONFIG_NFILE_STREAMS == 0
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I3c49ec02a9444f039ac7aac7b8ea6de5d1090340
---
libs/libc/libc.csv | 2 +-
libs/libc/stdio/lib_printf.c | 12 ++----------
libs/libc/stdio/lib_vprintf.c | 5 ++---
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/libs/libc/libc.csv b/libs/libc/libc.csv
index 3700207..d10d3c2 100644
--- a/libs/libc/libc.csv
+++ b/libs/libc/libc.csv
@@ -214,7 +214,7 @@
"usleep","unistd.h","","int","useconds_t"
"vasprintf","stdio.h","","int","FAR char **","FAR const IPTR char *","va_list"
"vfprintf","stdio.h","CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","FAR const IPTR char *","va_list"
-"vprintf","stdio.h","CONFIG_NFILE_STREAMS > 0","int","FAR const IPTR char *","va_list"
+"vprintf","stdio.h","","int","FAR const IPTR char *","va_list"
"vscanf","stdio.h","CONFIG_NFILE_STREAMS > 0","int","FAR const IPTR char *","va_list"
"vsnprintf","stdio.h","","int","FAR char *","size_t","FAR const IPTR char *","va_list"
"vsprintf","stdio.h","","int","FAR char *","FAR const IPTR char *","va_list"
diff --git a/libs/libc/stdio/lib_printf.c b/libs/libc/stdio/lib_printf.c
index 9bb7ac4..6dd02df 100644
--- a/libs/libc/stdio/lib_printf.c
+++ b/libs/libc/stdio/lib_printf.c
@@ -39,11 +39,7 @@
****************************************************************************/
#include <stdio.h>
-#include <syslog.h>
-
-#include <nuttx/syslog/syslog.h>
-
-#include "libc.h"
+#include <unistd.h>
/****************************************************************************
* Public Functions
@@ -59,11 +55,7 @@ int printf(FAR const IPTR char *fmt, ...)
int ret;
va_start(ap, fmt);
-#if CONFIG_NFILE_STREAMS > 0
- ret = vfprintf(stdout, fmt, ap);
-#else
- ret = nx_vsyslog(LOG_INFO, fmt, &ap);
-#endif
+ ret = vdprintf(STDOUT_FILENO, fmt, ap);
va_end(ap);
return ret;
diff --git a/libs/libc/stdio/lib_vprintf.c b/libs/libc/stdio/lib_vprintf.c
index 218b359..52a6761 100644
--- a/libs/libc/stdio/lib_vprintf.c
+++ b/libs/libc/stdio/lib_vprintf.c
@@ -38,6 +38,7 @@
****************************************************************************/
#include <stdio.h>
+#include <unistd.h>
/****************************************************************************
* Public Functions
@@ -49,7 +50,5 @@
int vprintf(FAR const IPTR char *fmt, va_list ap)
{
- /* vfprintf into stdout */
-
- return vfprintf(stdout, fmt, ap);
+ return vdprintf(STDOUT_FILENO, fmt, ap);
}