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-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 65ee6bea4 system/cu: disable error print if
SYSTEM_CUTERM_DISABLE_ERROR_PRINT enabled
65ee6bea4 is described below
commit 65ee6bea44d4700fb9a55e808b4c26d1f79dd6d8
Author: chao an <[email protected]>
AuthorDate: Thu Jun 8 19:31:48 2023 +0800
system/cu: disable error print if SYSTEM_CUTERM_DISABLE_ERROR_PRINT enabled
Test on sim/nsh (CONFIG_SYSTEM_CUTERM_DISABLE_ERROR_PRINT=y):
text data bss dec hex filename
397049 26704 4128 427881 68769 nuttx /* before */
396481 26704 4128 427313 68531 nuttx /* after */
-568
Signed-off-by: chao an <[email protected]>
---
system/cu/Kconfig | 4 ++++
system/cu/cu_main.c | 20 +++++++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/system/cu/Kconfig b/system/cu/Kconfig
index 21767c0d1..febc98fe0 100644
--- a/system/cu/Kconfig
+++ b/system/cu/Kconfig
@@ -45,4 +45,8 @@ config SYSTEM_CUTERM_PRIORITY
---help---
This is the task priority that will be used when starting the
CU terminal.
+config SYSTEM_CUTERM_DISABLE_ERROR_PRINT
+ bool "Disable CU terminal Error Printing"
+ default DEFAULT_SMALL
+
endif # SYSTEM_CUTERM
diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index 572533a19..bb6b6d7a1 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -56,6 +56,12 @@
#include "cu.h"
+#ifdef CONFIG_SYSTEM_CUTERM_DISABLE_ERROR_PRINT
+# define cu_error(...)
+#else
+# define cu_error(...) fprintf(stderr, __VA_ARGS__)
+#endif
+
/****************************************************************************
* Private Types
****************************************************************************/
@@ -173,7 +179,7 @@ static int set_termios(FAR struct cu_globals_s *cu, int
nocrlf)
ret = tcsetattr(cu->outfd, TCSANOW, &tio);
if (ret)
{
- fprintf(stderr, "set_termios: ERROR during tcsetattr(): %d\n", errno);
+ cu_error("set_termios: ERROR during tcsetattr(): %d\n", errno);
rc = -1;
goto errout;
}
@@ -191,7 +197,7 @@ static int set_termios(FAR struct cu_globals_s *cu, int
nocrlf)
ret = tcsetattr(cu->stdfd, TCSANOW, &tio);
if (ret)
{
- fprintf(stderr, "set_termios: ERROR during tcsetattr(): %d\n",
+ cu_error("set_termios: ERROR during tcsetattr(): %d\n",
errno);
rc = -1;
}
@@ -354,7 +360,7 @@ int main(int argc, FAR char *argv[])
cu->outfd = open(devname, O_WRONLY);
if (cu->outfd < 0)
{
- fprintf(stderr, "cu_main: ERROR: Failed to open %s for writing: %d\n",
+ cu_error("cu_main: ERROR: Failed to open %s for writing: %d\n",
devname, errno);
goto errout_with_devinit;
}
@@ -364,7 +370,7 @@ int main(int argc, FAR char *argv[])
ret = tcgetattr(cu->outfd, &cu->devtio);
if (ret)
{
- fprintf(stderr, "cu_main: ERROR during tcgetattr(): %d\n", errno);
+ cu_error("cu_main: ERROR during tcgetattr(): %d\n", errno);
goto errout_with_outfd;
}
@@ -410,7 +416,7 @@ int main(int argc, FAR char *argv[])
cu->infd = open(devname, O_RDONLY);
if (cu->infd < 0)
{
- fprintf(stderr, "cu_main: ERROR: Failed to open %s for reading: %d\n",
+ cu_error("cu_main: ERROR: Failed to open %s for reading: %d\n",
devname, errno);
goto errout_with_outfd;
}
@@ -420,7 +426,7 @@ int main(int argc, FAR char *argv[])
ret = pthread_attr_init(&attr);
if (ret != OK)
{
- fprintf(stderr, "cu_main: pthread_attr_init failed: %d\n", ret);
+ cu_error("cu_main: pthread_attr_init failed: %d\n", ret);
goto errout_with_fds;
}
@@ -432,7 +438,7 @@ int main(int argc, FAR char *argv[])
pthread_attr_destroy(&attr);
if (ret != 0)
{
- fprintf(stderr, "cu_main: Error in thread creation: %d\n", ret);
+ cu_error("cu_main: Error in thread creation: %d\n", ret);
goto errout_with_fds;
}