You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/27 08:43:38 UTC
[incubator-nuttx-apps] branch master updated (d1821c9 -> ec0f0b7)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from d1821c9 netutils/thttpd/thttpd.c: Fix syslog formats
new 3e01532 netutils/ftpd/ftpd.c: Fix syslog formats
new db07ae4 system/nxplayer/nxplayer.c: Don't assume debug macro expansion
new ed768d1 system/nxplayer/nxplayer.c: Fix a syslog format
new ce3ca22 system/nxrecorder/nxrecorder.c: Don't assume debug macro expansion
new ec0f0b7 system/nxrecorder/nxrecorder.c: Fix a syslog format
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
netutils/ftpd/ftpd.c | 6 +++---
system/nxplayer/nxplayer.c | 7 ++++++-
system/nxrecorder/nxrecorder.c | 7 ++++++-
3 files changed, 15 insertions(+), 5 deletions(-)
[incubator-nuttx-apps] 05/05: system/nxrecorder/nxrecorder.c: Fix a
syslog format
Posted by xi...@apache.org.
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/incubator-nuttx-apps.git
commit ec0f0b7fbc187888ae9d89178595b538059c1f8a
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 14:15:08 2020 +0900
system/nxrecorder/nxrecorder.c: Fix a syslog format
---
system/nxrecorder/nxrecorder.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index 150f5f5..1a5ba11 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -94,7 +94,8 @@ static int nxrecorder_opendevice(FAR struct nxrecorder_s *precorder)
int errcode = errno;
DEBUGASSERT(errcode > 0);
- auderr("ERROR: Failed to open %s: %d\n", -errcode);
+ auderr("ERROR: Failed to open %s: %d\n",
+ precorder->device, -errcode);
UNUSED(errcode);
return -ENOENT;
}
[incubator-nuttx-apps] 02/05: system/nxplayer/nxplayer.c: Don't
assume debug macro expansion
Posted by xi...@apache.org.
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/incubator-nuttx-apps.git
commit db07ae43eeae7a5b467b562fc94cb184f218c0de
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 14:11:17 2020 +0900
system/nxplayer/nxplayer.c: Don't assume debug macro expansion
---
system/nxplayer/nxplayer.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index bb178f3..0ab7fe9 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -1082,7 +1082,9 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
/* Send a stop message to the device */
+#ifdef CONFIG_DEBUG_FEATURES
audinfo("Stopping! outstanding=%d\n", outstanding);
+#endif
#ifdef CONFIG_AUDIO_MULTI_SESSION
ioctl(pplayer->dev_fd, AUDIOIOC_STOP,
@@ -1101,7 +1103,9 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
/* Message indicating the playback is complete */
case AUDIO_MSG_COMPLETE:
+#ifdef CONFIG_DEBUG_FEATURES
audinfo("Play complete. outstanding=%d\n", outstanding);
+#endif
DEBUGASSERT(outstanding == 0);
running = false;
break;
[incubator-nuttx-apps] 04/05: system/nxrecorder/nxrecorder.c: Don't
assume debug macro expansion
Posted by xi...@apache.org.
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/incubator-nuttx-apps.git
commit ce3ca221527f46f1ef5b180d9a4c7caf8f360a11
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 14:14:36 2020 +0900
system/nxrecorder/nxrecorder.c: Don't assume debug macro expansion
---
system/nxrecorder/nxrecorder.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index ded4ae9..150f5f5 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -484,7 +484,9 @@ static void *nxrecorder_recordthread(pthread_addr_t pvarg)
/* Send a stop message to the device */
+#ifdef CONFIG_DEBUG_FEATURES
audinfo("Stopping! outstanding=%d\n", outstanding);
+#endif
#ifdef CONFIG_AUDIO_MULTI_SESSION
ioctl(precorder->dev_fd, AUDIOIOC_STOP,
@@ -503,7 +505,9 @@ static void *nxrecorder_recordthread(pthread_addr_t pvarg)
/* Message indicating the recordback is complete */
case AUDIO_MSG_COMPLETE:
+#ifdef CONFIG_DEBUG_FEATURES
audinfo("Record complete. outstanding=%d\n", outstanding);
+#endif
running = false;
break;
[incubator-nuttx-apps] 01/05: netutils/ftpd/ftpd.c: Fix syslog
formats
Posted by xi...@apache.org.
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/incubator-nuttx-apps.git
commit 3e015320e305075ff5a13d6d1ef1b33e7bbcee98
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 14:08:45 2020 +0900
netutils/ftpd/ftpd.c: Fix syslog formats
---
netutils/ftpd/ftpd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 87140d3..24c6727 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -1842,7 +1842,7 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype)
seekpos = ftpd_offsatoi(path, session->restartpos);
if (seekpos < 0)
{
- nerr("ERROR: ftpd_offsatoi failed: %d\n", seekpos);
+ nerr("ERROR: ftpd_offsatoi failed: %jd\n", (intmax_t)seekpos);
errval = -seekpos;
}
}
@@ -1851,7 +1851,7 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype)
seekpos = session->restartpos;
if (seekpos < 0)
{
- nerr("ERROR: Bad restartpos: %d\n", seekpos);
+ nerr("ERROR: Bad restartpos: %jd\n", (intmax_t)seekpos);
errval = EINVAL;
}
}
@@ -2384,7 +2384,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
if (!dir)
{
int errval = errno;
- nerr("ERROR: dir() failed\n", errval);
+ nerr("ERROR: dir() failed: %d\n", errval);
return -errval;
}
[incubator-nuttx-apps] 03/05: system/nxplayer/nxplayer.c: Fix a
syslog format
Posted by xi...@apache.org.
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/incubator-nuttx-apps.git
commit ed768d11592d2177984f9bc4904d51190fdafa09
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 14:11:31 2020 +0900
system/nxplayer/nxplayer.c: Fix a syslog format
---
system/nxplayer/nxplayer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 0ab7fe9..8f74a9a 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -316,7 +316,8 @@ static int nxplayer_opendevice(FAR struct nxplayer_s *pplayer, int format,
int errcode = errno;
DEBUGASSERT(errcode > 0);
- auderr("ERROR: Failed to open %s: %d\n", -errcode);
+ auderr("ERROR: Failed to open %s: %d\n",
+ pplayer->prefdevice, -errcode);
UNUSED(errcode);
return -ENOENT;
}