You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2021/11/02 08:00:20 UTC
[incubator-nuttx] 02/02: libc: Move lib_filesem.c and lib_stream.c
to libc/stdio
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit aa9c17e93de50272cf89f2cfa90e834955064cbe
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 31 23:46:31 2021 +0800
libc: Move lib_filesem.c and lib_stream.c to libc/stdio
since it make more sense to put all FILE functions in one place
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
libs/libc/misc/Make.defs | 10 ----------
libs/libc/stdio/Make.defs | 9 ++-------
libs/libc/{misc/lib_filesem.c => stdio/lib_libfilesem.c} | 2 +-
libs/libc/{misc/lib_stream.c => stdio/lib_libstream.c} | 2 +-
4 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/libs/libc/misc/Make.defs b/libs/libc/misc/Make.defs
index 8d26b67..e1331fc 100644
--- a/libs/libc/misc/Make.defs
+++ b/libs/libc/misc/Make.defs
@@ -23,21 +23,11 @@
CSRCS += lib_umask.c lib_utsname.c
CSRCS += lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
-ifneq ($(CONFIG_STDIO_DISABLE_BUFFERING),y)
-CSRCS += lib_filesem.c
-endif
-
# Support for platforms that do not have long long types
CSRCS += lib_umul32.c lib_umul64.c lib_umul32x64.c
CSRCS += lib_uadd32x64.c lib_uadd64.c lib_usub64x32.c lib_usub64.c
-# Add C files that depend on file OR socket descriptors
-
-ifeq ($(CONFIG_FILE_STREAM),y)
-CSRCS += lib_stream.c
-endif
-
ifeq ($(CONFIG_PIPES),y)
CSRCS += lib_mkfifo.c
endif
diff --git a/libs/libc/stdio/Make.defs b/libs/libc/stdio/Make.defs
index c260544..a1ba9ec 100644
--- a/libs/libc/stdio/Make.defs
+++ b/libs/libc/stdio/Make.defs
@@ -32,11 +32,11 @@ CSRCS += lib_libsnoflush.c lib_libvsprintf.c lib_ultoa_invert.c
ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
CSRCS += lib_dtoa_engine.c lib_dtoa_data.c
endif
+CSRCS += lib_tempnam.c lib_tmpnam.c
# The remaining sources files depend upon C streams
ifeq ($(CONFIG_FILE_STREAM),y)
-
CSRCS += lib_fopen.c lib_freopen.c lib_fclose.c lib_fread.c lib_libfread.c
CSRCS += lib_fseek.c lib_fseeko.c lib_ftell.c lib_ftello.c lib_fsetpos.c
CSRCS += lib_getdelim.c lib_fgetpos.c lib_getc.c lib_getchar.c lib_fgetc.c
@@ -49,14 +49,9 @@ CSRCS += lib_stdsostream.c lib_perror.c lib_feof.c lib_ferror.c
CSRCS += lib_rawinstream.c lib_rawoutstream.c lib_rawsistream.c
CSRCS += lib_rawsostream.c lib_remove.c lib_rewind.c lib_clearerr.c
CSRCS += lib_scanf.c lib_vscanf.c lib_fscanf.c lib_vfscanf.c lib_tmpfile.c
-CSRCS += lib_setbuf.c lib_setvbuf.c
-
+CSRCS += lib_setbuf.c lib_setvbuf.c lib_libstream.c lib_libfilesem.c
endif
-CSRCS += lib_tempnam.c lib_tmpnam.c
-
-# Other support that depends on specific, configured features.
-
# Add the stdio directory to the build
DEPPATH += --dep-path stdio
diff --git a/libs/libc/misc/lib_filesem.c b/libs/libc/stdio/lib_libfilesem.c
similarity index 99%
rename from libs/libc/misc/lib_filesem.c
rename to libs/libc/stdio/lib_libfilesem.c
index bbe63b3..a67a89d 100644
--- a/libs/libc/misc/lib_filesem.c
+++ b/libs/libc/stdio/lib_libfilesem.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/misc/lib_filesem.c
+ * libs/libc/stdio/lib_libfilesem.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/libs/libc/misc/lib_stream.c b/libs/libc/stdio/lib_libstream.c
similarity index 99%
rename from libs/libc/misc/lib_stream.c
rename to libs/libc/stdio/lib_libstream.c
index a749af0..b59bf3d 100644
--- a/libs/libc/misc/lib_stream.c
+++ b/libs/libc/stdio/lib_libstream.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/misc/lib_stream.c
+ * libs/libc/stdio/lib_libstream.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with