(nuttx) branch master updated: ramlog: Remove RAMLOG_CRLF config and related code

[archer]

This is an automated email from the ASF dual-hosted git repository.

archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c882cb790 ramlog: Remove RAMLOG_CRLF config and related code
8c882cb790 is described below

commit 8c882cb7908f68d0aa2a079bdd74876055e0e211
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Mon Oct 21 12:18:43 2024 +0800

    ramlog: Remove RAMLOG_CRLF config and related code
    
    since the conversion is moved to common layer after:
    https://github.com/apache/nuttx/pull/14362
    
    Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
 drivers/syslog/Kconfig  |  7 -------
 drivers/syslog/ramlog.c | 35 +----------------------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig
index 20681a83fa..fbab7ef62e 100644
--- a/drivers/syslog/Kconfig
+++ b/drivers/syslog/Kconfig
@@ -77,13 +77,6 @@ config RAMLOG
                details as needed to support logging.
 
 if RAMLOG
-config RAMLOG_CRLF
-       bool "RAMLOG CR/LF"
-       default n
-       ---help---
-               Pre-pend a carriage return before every linefeed that goes into 
the
-               RAM log.
-
 config RAMLOG_NONBLOCKING
        bool "RAMLOG non-block reads"
        default y
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index c16471edc9..5b345865b3 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -289,16 +289,11 @@ static void ramlog_copybuf(FAR struct ramlog_dev_s *priv,
 static ssize_t ramlog_addbuf(FAR struct ramlog_dev_s *priv,
                              FAR const char *buffer, size_t len)
 {
-#if defined(CONFIG_RAMLOG_SYSLOG) || defined(CONFIG_RAMLOG_CRLF)
+#ifdef CONFIG_RAMLOG_SYSLOG
   FAR struct ramlog_header_s *header = priv->rl_header;
 #endif
   size_t buflen = len;
   irqstate_t flags;
-#ifdef CONFIG_RAMLOG_CRLF
-  FAR const char *end;
-  FAR const char *pos;
-  FAR char *buf;
-#endif
 
   /* Disable interrupts (in case we are NOT called from interrupt handler) */
 
@@ -318,35 +313,7 @@ static ssize_t ramlog_addbuf(FAR struct ramlog_dev_s *priv,
       buflen = priv->rl_bufsize;
     }
 
-#ifdef CONFIG_RAMLOG_CRLF
-  buf = header->rl_buffer;
-  end = buffer + buflen;
-  pos = buffer;
-
-  do
-    {
-      /* Ignore carriage returns */
-
-      if (*pos == '\r' || *pos == '\n')
-        {
-          ramlog_copybuf(priv, buffer, pos - buffer);
-          buffer = pos + 1;
-        }
-
-      /* Pre-pend a carriage before a linefeed */
-
-      if (*pos == '\n')
-        {
-          buf[header->rl_head++ % priv->rl_bufsize] = '\r';
-          buf[header->rl_head++ % priv->rl_bufsize] = '\n';
-        }
-    }
-  while (++pos != end);
-
-  ramlog_copybuf(priv, buffer, pos - buffer);
-#else
   ramlog_copybuf(priv, buffer, buflen);
-#endif
 
   /* Was anything written? */