You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/09/23 10:22:24 UTC
(nuttx) 06/06: libs/libc/stdio: Optimize header file dependencies in *prinf.c file.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 90d990712da72ad064fdb70e32ca3a7de34e0304
Author: dongjiuzhu1 <do...@xiaomi.com>
AuthorDate: Fri May 31 14:54:53 2024 +0800
libs/libc/stdio: Optimize header file dependencies in *prinf.c file.
Signed-off-by: likun17 <li...@xiaomi.com>
Signed-off-by: dongjiuzhu1 <do...@xiaomi.com>
---
include/nuttx/streams.h | 2 +-
libs/libc/libc.h | 2 --
libs/libc/stdio/lib_asprintf.c | 3 ---
libs/libc/stdio/lib_dtoa_engine.h | 2 ++
libs/libc/stdio/lib_libbsprintf.c | 7 ++-----
libs/libc/stdio/lib_libsprintf.c | 3 +--
libs/libc/stdio/lib_libvsprintf.c | 14 +++++---------
libs/libc/stdio/lib_printf.c | 2 --
libs/libc/stdio/lib_snprintf.c | 7 +------
libs/libc/stdio/lib_ultoa_invert.h | 2 --
libs/libc/stdio/lib_vasprintf.c | 7 +------
libs/libc/stdio/lib_vdprintf.c | 6 +-----
libs/libc/stdio/lib_vfprintf.c | 6 +-----
libs/libc/stdio/lib_vprintf.c | 2 --
libs/libc/stdio/lib_vsnprintf.c | 7 +------
libs/libc/stream/lib_libnoflush.c | 10 ----------
16 files changed, 16 insertions(+), 66 deletions(-)
diff --git a/include/nuttx/streams.h b/include/nuttx/streams.h
index ee5decc083..db4f7ba3bb 100644
--- a/include/nuttx/streams.h
+++ b/include/nuttx/streams.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
+#include <nuttx/compiler.h>
#ifdef CONFIG_LIBC_LZF
#include <lzf.h>
diff --git a/libs/libc/libc.h b/libs/libc/libc.h
index b531fa87ff..540c805595 100644
--- a/libs/libc/libc.h
+++ b/libs/libc/libc.h
@@ -25,8 +25,6 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
#ifndef __ASSEMBLY__
# include <sys/types.h>
# include <stdbool.h>
diff --git a/libs/libc/stdio/lib_asprintf.c b/libs/libc/stdio/lib_asprintf.c
index 3a45aea660..ce062d6fdc 100644
--- a/libs/libc/stdio/lib_asprintf.c
+++ b/libs/libc/stdio/lib_asprintf.c
@@ -23,9 +23,6 @@
****************************************************************************/
#include <stdio.h>
-#include <stdarg.h>
-
-#include "libc.h"
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_dtoa_engine.h b/libs/libc/stdio/lib_dtoa_engine.h
index a60e939875..d09e1dff1e 100644
--- a/libs/libc/stdio/lib_dtoa_engine.h
+++ b/libs/libc/stdio/lib_dtoa_engine.h
@@ -40,6 +40,8 @@
* Included Files
****************************************************************************/
+#include <nuttx/compiler.h>
+
#include <stdint.h>
#include <float.h>
diff --git a/libs/libc/stdio/lib_libbsprintf.c b/libs/libc/stdio/lib_libbsprintf.c
index 2acd27e652..714d561d4d 100644
--- a/libs/libc/stdio/lib_libbsprintf.c
+++ b/libs/libc/stdio/lib_libbsprintf.c
@@ -22,14 +22,11 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
#include <nuttx/streams.h>
-#include <nuttx/compiler.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_libsprintf.c b/libs/libc/stdio/lib_libsprintf.c
index 1408d119b6..5b16b48c09 100644
--- a/libs/libc/stdio/lib_libsprintf.c
+++ b/libs/libc/stdio/lib_libsprintf.c
@@ -22,8 +22,7 @@
* Included Files
****************************************************************************/
-#include <stdio.h>
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_libvsprintf.c b/libs/libc/stdio/lib_libvsprintf.c
index fef65a2535..34911c0911 100644
--- a/libs/libc/stdio/lib_libvsprintf.c
+++ b/libs/libc/stdio/lib_libvsprintf.c
@@ -40,18 +40,14 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include <nuttx/compiler.h>
#include <nuttx/streams.h>
+#ifdef CONFIG_ALLSYMS
#include <nuttx/allsyms.h>
#include <nuttx/symtab.h>
+#endif
+
+#include <assert.h>
+#include <string.h>
#include "lib_dtoa_engine.h"
#include "lib_ultoa_invert.h"
diff --git a/libs/libc/stdio/lib_printf.c b/libs/libc/stdio/lib_printf.c
index fa12bacbc1..2d93482598 100644
--- a/libs/libc/stdio/lib_printf.c
+++ b/libs/libc/stdio/lib_printf.c
@@ -23,8 +23,6 @@
****************************************************************************/
#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_snprintf.c b/libs/libc/stdio/lib_snprintf.c
index a8152d4ec7..6884f36f73 100644
--- a/libs/libc/stdio/lib_snprintf.c
+++ b/libs/libc/stdio/lib_snprintf.c
@@ -22,12 +22,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_ultoa_invert.h b/libs/libc/stdio/lib_ultoa_invert.h
index 7f7d3fb86a..b297a2f950 100644
--- a/libs/libc/stdio/lib_ultoa_invert.h
+++ b/libs/libc/stdio/lib_ultoa_invert.h
@@ -42,8 +42,6 @@
#include <nuttx/compiler.h>
-#include <nuttx/config.h>
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
diff --git a/libs/libc/stdio/lib_vasprintf.c b/libs/libc/stdio/lib_vasprintf.c
index efaed060aa..257640a788 100644
--- a/libs/libc/stdio/lib_vasprintf.c
+++ b/libs/libc/stdio/lib_vasprintf.c
@@ -22,12 +22,7 @@
* Included Files
****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/libs/libc/stdio/lib_vdprintf.c b/libs/libc/stdio/lib_vdprintf.c
index b04b044e08..aef5923156 100644
--- a/libs/libc/stdio/lib_vdprintf.c
+++ b/libs/libc/stdio/lib_vdprintf.c
@@ -38,11 +38,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_vfprintf.c b/libs/libc/stdio/lib_vfprintf.c
index 3595f80f81..511acccc6e 100644
--- a/libs/libc/stdio/lib_vfprintf.c
+++ b/libs/libc/stdio/lib_vfprintf.c
@@ -22,11 +22,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_vprintf.c b/libs/libc/stdio/lib_vprintf.c
index 1f5c9c43ff..eeb0e1652e 100644
--- a/libs/libc/stdio/lib_vprintf.c
+++ b/libs/libc/stdio/lib_vprintf.c
@@ -23,8 +23,6 @@
****************************************************************************/
#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stdio/lib_vsnprintf.c b/libs/libc/stdio/lib_vsnprintf.c
index f7450b3a58..292056ce76 100644
--- a/libs/libc/stdio/lib_vsnprintf.c
+++ b/libs/libc/stdio/lib_vsnprintf.c
@@ -22,12 +22,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "libc.h"
+#include <nuttx/streams.h>
/****************************************************************************
* Public Functions
diff --git a/libs/libc/stream/lib_libnoflush.c b/libs/libc/stream/lib_libnoflush.c
index 6aa9c172a8..61dc0bc0b6 100644
--- a/libs/libc/stream/lib_libnoflush.c
+++ b/libs/libc/stream/lib_libnoflush.c
@@ -22,18 +22,8 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <nuttx/fs/fs.h>
#include <nuttx/streams.h>
-#include "libc.h"
-
/****************************************************************************
* Public Functions
****************************************************************************/