Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

syslog/rpmsg_server: fix build break if enable SYSLOG_RPMSG/SYSLOG_RPMSG_SERVER #15903

Merged
merged 1 commit into from
Feb 25, 2025
Merged

syslog/rpmsg_server: fix build break if enable SYSLOG_RPMSG/SYSLOG_RPMSG_SERVER #15903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions drivers/syslog/syslog_rpmsg_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ struct syslog_rpmsg_server_s
* Private Function Prototypes
****************************************************************************/

static void syslog_rpmsg_write(FAR const char *buf1, size_t len1,
FAR const char *buf2, size_t len2);
static void syslog_rpmsg_write_internal(FAR const char *buf1, size_t len1,
FAR const char *buf2, size_t len2);
static bool syslog_rpmsg_ns_match(FAR struct rpmsg_device *rdev,
FAR void *priv_, FAR const char *name,
uint32_t dest);
Expand Down Expand Up @@ -131,8 +131,9 @@ static int syslog_rpmsg_file_ioctl(FAR struct file *filep, int cmd,
}
#endif

static void syslog_rpmsg_write(FAR const char *buf1, size_t len1,
FAR const char *buf2, size_t len2)
static void
syslog_rpmsg_write_internal(FAR const char *buf1, size_t len1,
FAR const char *buf2, size_t len2)
{
FAR const char *nl;
size_t len;
Expand Down Expand Up @@ -178,7 +179,7 @@ static void syslog_rpmsg_ept_release(FAR struct rpmsg_endpoint *ept)

if (priv->nextpos)
{
syslog_rpmsg_write(priv->tmpbuf, priv->nextpos, "\n", 1);
syslog_rpmsg_write_internal(priv->tmpbuf, priv->nextpos, "\n", 1);
}

#ifdef CONFIG_SYSLOG_RPMSG_SERVER_CHARDEV
Expand Down Expand Up @@ -244,8 +245,9 @@ static int syslog_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept,

if (priv->nextpos)
{
syslog_rpmsg_write(priv->tmpbuf, priv->nextpos,
msg->data, printed);
syslog_rpmsg_write_internal(priv->tmpbuf,
priv->nextpos,
msg->data, printed);
priv->nextpos = 0;
}
else
Expand Down
Loading