You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/04/15 15:30:59 UTC
[incubator-nuttx] 01/05: syslog/rpmsg: fix the naming conflict of
function 'syslog_rpmsg_putc'.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ab566de77af3155a1eccd0e81a07cbb1b47ec501
Author: zhongan <zh...@xiaomi.com>
AuthorDate: Tue Apr 7 20:39:53 2020 +0800
syslog/rpmsg: fix the naming conflict of function 'syslog_rpmsg_putc'.
Change-Id: I3f89bfed71edb85bc3006446c1f9141e95202b5c
Signed-off-by: zhongan <zh...@xiaomi.com>
---
drivers/syslog/syslog_rpmsg.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/syslog/syslog_rpmsg.c b/drivers/syslog/syslog_rpmsg.c
index 7ac43d2..2612059 100644
--- a/drivers/syslog/syslog_rpmsg.c
+++ b/drivers/syslog/syslog_rpmsg.c
@@ -88,8 +88,8 @@ struct syslog_rpmsg_s
****************************************************************************/
static void syslog_rpmsg_work(FAR void *priv_);
-static void syslog_rpmsg_putc(FAR struct syslog_rpmsg_s *priv, int ch,
- bool last);
+static void syslog_rpmsg_putchar(FAR struct syslog_rpmsg_s *priv, int ch,
+ bool last);
static int syslog_rpmsg_flush(void);
static ssize_t syslog_rpmsg_write(FAR const char *buffer, size_t buflen);
static void syslog_rpmsg_device_created(FAR struct rpmsg_device *rdev,
@@ -177,8 +177,8 @@ static void syslog_rpmsg_work(FAR void *priv_)
rpmsg_send_nocopy(&priv->ept, msg, sizeof(*msg) + len);
}
-static void syslog_rpmsg_putc(FAR struct syslog_rpmsg_s *priv, int ch,
- bool last)
+static void syslog_rpmsg_putchar(FAR struct syslog_rpmsg_s *priv, int ch,
+ bool last)
{
if (B2C_REM(priv->head) == 0)
{
@@ -244,7 +244,7 @@ static ssize_t syslog_rpmsg_write(FAR const char *buffer, size_t buflen)
flags = enter_critical_section();
for (nwritten = 1; nwritten <= buflen; nwritten++)
{
- syslog_rpmsg_putc(priv, *buffer++, nwritten == buflen);
+ syslog_rpmsg_putchar(priv, *buffer++, nwritten == buflen);
}
leave_critical_section(flags);
@@ -352,7 +352,7 @@ int syslog_rpmsg_putc(int ch)
irqstate_t flags;
flags = enter_critical_section();
- syslog_rpmsg_putc(priv, ch, true);
+ syslog_rpmsg_putchar(priv, ch, true);
leave_critical_section(flags);
return ch;