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 2023/03/28 17:54:23 UTC
[nuttx-apps] branch master updated (a1bca5070 -> d650d3276)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
from a1bca5070 Changes to apps needed by nutts PR 8885
new efb4e0bc9 Add another batch of missing headers throughout the repository
new ce68d7a73 examples/popen: Fix NxStyle long line warning
new d650d3276 luamodules: Fix implicit declaration warning for strncasecmp
The 3 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:
examples/foc/foc_fixed16_thr.c | 8 +++---
examples/foc/foc_float_thr.c | 8 +++---
examples/foc/foc_motor_b16.c | 4 +--
examples/foc/foc_motor_f32.c | 4 +--
examples/foc/foc_thr.c | 3 ++-
examples/pipe/interlock_test.c | 10 ++++----
examples/pipe/transfer_test.c | 3 ++-
examples/popen/popen_main.c | 6 +++--
examples/watchdog/watchdog_main.c | 12 ++++-----
industry/foc/fixed16/foc_ang_openloop.c | 1 +
industry/foc/fixed16/foc_angle.c | 1 +
industry/foc/fixed16/foc_handler.c | 1 +
industry/foc/fixed16/foc_model.c | 1 +
industry/foc/fixed16/foc_routine.c | 1 +
industry/foc/fixed16/foc_velocity.c | 1 +
industry/foc/float/foc_ang_openloop.c | 1 +
industry/foc/float/foc_angle.c | 1 +
industry/foc/float/foc_handler.c | 1 +
industry/foc/float/foc_model.c | 1 +
industry/foc/float/foc_routine.c | 1 +
industry/foc/float/foc_velocity.c | 1 +
...implicit-declaration-warning-for-strncase.patch | 26 +++++++++++++++++++
interpreters/luamodules/cjson/Makefile | 1 +
system/nxlooper/nxlooper.c | 22 ++++++++--------
system/nxplayer/nxplayer.c | 29 +++++++++++-----------
system/nxplayer/nxplayer_mp3.c | 4 ++-
system/nxrecorder/nxrecorder.c | 21 ++++++++--------
testing/ostest/suspend.c | 3 +++
28 files changed, 112 insertions(+), 64 deletions(-)
create mode 100644 interpreters/luamodules/cjson/0002-bugfix-Fix-implicit-declaration-warning-for-strncase.patch
[nuttx-apps] 03/03: luamodules: Fix implicit declaration warning for strncasecmp
Posted by ac...@apache.org.
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/nuttx-apps.git
commit d650d3276f15236da91f3477c32c6b4995807e06
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Wed Mar 8 18:35:37 2023 -0300
luamodules: Fix implicit declaration warning for strncasecmp
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
...implicit-declaration-warning-for-strncase.patch | 26 ++++++++++++++++++++++
interpreters/luamodules/cjson/Makefile | 1 +
2 files changed, 27 insertions(+)
diff --git a/interpreters/luamodules/cjson/0002-bugfix-Fix-implicit-declaration-warning-for-strncase.patch b/interpreters/luamodules/cjson/0002-bugfix-Fix-implicit-declaration-warning-for-strncase.patch
new file mode 100644
index 000000000..6beef060b
--- /dev/null
+++ b/interpreters/luamodules/cjson/0002-bugfix-Fix-implicit-declaration-warning-for-strncase.patch
@@ -0,0 +1,26 @@
+From e6e8fbe68a95bf6fca463781dbc22e631c4b7b7a Mon Sep 17 00:00:00 2001
+From: Gustavo Henrique Nihei <gu...@espressif.com>
+Date: Wed, 8 Mar 2023 17:18:02 -0300
+Subject: [PATCH] bugfix: Fix implicit declaration warning for strncasecmp
+ function
+
+Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
+---
+ lua_cjson.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lua_cjson.c b/lua_cjson.c
+index 42672de..f443626 100644
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -39,6 +39,7 @@
+ #include <assert.h>
+ #include <stdint.h>
+ #include <string.h>
++#include <strings.h>
+ #include <math.h>
+ #include <limits.h>
+ #include <lua.h>
+--
+2.37.2
+
diff --git a/interpreters/luamodules/cjson/Makefile b/interpreters/luamodules/cjson/Makefile
index c5a8fb800..2fd741157 100644
--- a/interpreters/luamodules/cjson/Makefile
+++ b/interpreters/luamodules/cjson/Makefile
@@ -39,6 +39,7 @@ $(LUACJSON_UNPACK): $(LUACJSON_TARBALL)
$(Q) tar -xvzf $(LUACJSON_TARBALL)
$(Q) mv lua-cjson-$(LUACJSON_VERSION) $(LUACJSON_UNPACK)
$(Q) patch -d $(LUACJSON_UNPACK) -p1 < 0001-fix-compile-warnings.patch
+ $(Q) patch -d $(LUACJSON_UNPACK) -p1 < 0002-bugfix-Fix-implicit-declaration-warning-for-strncase.patch
$(LUACJSON_UNPACK)/.patch: $(LUACJSON_UNPACK)
touch $(LUACJSON_UNPACK)/.patch
[nuttx-apps] 02/03: examples/popen: Fix NxStyle long line warning
Posted by ac...@apache.org.
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/nuttx-apps.git
commit ce68d7a7388ff63b20c0259be871d35cb7dec9db
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Wed Mar 8 18:34:59 2023 -0300
examples/popen: Fix NxStyle long line warning
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
examples/popen/popen_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c
index d9ef10c51..d928629e1 100644
--- a/examples/popen/popen_main.c
+++ b/examples/popen/popen_main.c
@@ -167,7 +167,8 @@ int main(int argc, FAR char *argv[])
if (errcode == ECHILD)
{
- printf("The shell has already exited (and exit status is not available)\n");
+ printf("The shell has already exited "
+ "(and exit status is not available)\n");
}
else
{
[nuttx-apps] 01/03: Add another batch of missing headers throughout the repository
Posted by ac...@apache.org.
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/nuttx-apps.git
commit efb4e0bc913a8858aac20aa9210fba3dba817e69
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Wed Mar 8 15:57:51 2023 -0300
Add another batch of missing headers throughout the repository
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
examples/foc/foc_fixed16_thr.c | 8 ++++----
examples/foc/foc_float_thr.c | 8 ++++----
examples/foc/foc_motor_b16.c | 4 ++--
examples/foc/foc_motor_f32.c | 4 ++--
examples/foc/foc_thr.c | 3 ++-
examples/pipe/interlock_test.c | 10 +++++-----
examples/pipe/transfer_test.c | 3 ++-
examples/popen/popen_main.c | 3 ++-
examples/watchdog/watchdog_main.c | 12 ++++++------
industry/foc/fixed16/foc_ang_openloop.c | 1 +
industry/foc/fixed16/foc_angle.c | 1 +
industry/foc/fixed16/foc_handler.c | 1 +
industry/foc/fixed16/foc_model.c | 1 +
industry/foc/fixed16/foc_routine.c | 1 +
industry/foc/fixed16/foc_velocity.c | 1 +
industry/foc/float/foc_ang_openloop.c | 1 +
industry/foc/float/foc_angle.c | 1 +
industry/foc/float/foc_handler.c | 1 +
industry/foc/float/foc_model.c | 1 +
industry/foc/float/foc_routine.c | 1 +
industry/foc/float/foc_velocity.c | 1 +
system/nxlooper/nxlooper.c | 22 +++++++++++-----------
system/nxplayer/nxplayer.c | 29 ++++++++++++++---------------
system/nxplayer/nxplayer_mp3.c | 4 +++-
system/nxrecorder/nxrecorder.c | 21 +++++++++++----------
testing/ostest/suspend.c | 3 +++
26 files changed, 83 insertions(+), 63 deletions(-)
diff --git a/examples/foc/foc_fixed16_thr.c b/examples/foc/foc_fixed16_thr.c
index e507b2a15..5735adf29 100644
--- a/examples/foc/foc_fixed16_thr.c
+++ b/examples/foc/foc_fixed16_thr.c
@@ -24,12 +24,12 @@
#include <nuttx/config.h>
-#include <stdio.h>
-#include <fcntl.h>
#include <assert.h>
-#include <unistd.h>
-
#include <dspb16.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
#include "foc_cfg.h"
#include "foc_debug.h"
diff --git a/examples/foc/foc_float_thr.c b/examples/foc/foc_float_thr.c
index 7d26687bb..131d3c8e4 100644
--- a/examples/foc/foc_float_thr.c
+++ b/examples/foc/foc_float_thr.c
@@ -24,12 +24,12 @@
#include <nuttx/config.h>
-#include <stdio.h>
-#include <fcntl.h>
#include <assert.h>
-#include <unistd.h>
-
#include <dsp.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
#include "foc_cfg.h"
#include "foc_debug.h"
diff --git a/examples/foc/foc_motor_b16.c b/examples/foc/foc_motor_b16.c
index b2a8ef5cf..5c030b48c 100644
--- a/examples/foc/foc_motor_b16.c
+++ b/examples/foc/foc_motor_b16.c
@@ -25,11 +25,11 @@
#include <nuttx/config.h>
#include <assert.h>
-
-#include "foc_motor_b16.h"
+#include <string.h>
#include "foc_cfg.h"
#include "foc_debug.h"
+#include "foc_motor_b16.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/examples/foc/foc_motor_f32.c b/examples/foc/foc_motor_f32.c
index 37103e0d2..b1ccc6153 100644
--- a/examples/foc/foc_motor_f32.c
+++ b/examples/foc/foc_motor_f32.c
@@ -25,11 +25,11 @@
#include <nuttx/config.h>
#include <assert.h>
-
-#include "foc_motor_f32.h"
+#include <string.h>
#include "foc_cfg.h"
#include "foc_debug.h"
+#include "foc_motor_f32.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/examples/foc/foc_thr.c b/examples/foc/foc_thr.c
index 11cb71711..debec1529 100644
--- a/examples/foc/foc_thr.c
+++ b/examples/foc/foc_thr.c
@@ -24,9 +24,10 @@
#include <nuttx/config.h>
-#include <fcntl.h>
#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
#include "foc_mq.h"
#include "foc_thr.h"
diff --git a/examples/pipe/interlock_test.c b/examples/pipe/interlock_test.c
index cddda2df2..cb00bd268 100644
--- a/examples/pipe/interlock_test.c
+++ b/examples/pipe/interlock_test.c
@@ -23,14 +23,14 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <sys/stat.h>
-
-#include <sys/types.h>
-#include <stdio.h>
+#include <errno.h>
#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
-#include <errno.h>
#include "pipe.h"
diff --git a/examples/pipe/transfer_test.c b/examples/pipe/transfer_test.c
index 1fe5ec03f..fc379c02b 100644
--- a/examples/pipe/transfer_test.c
+++ b/examples/pipe/transfer_test.c
@@ -24,9 +24,10 @@
#include <nuttx/config.h>
+#include <errno.h>
+#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
-#include <errno.h>
#include "pipe.h"
diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c
index 1a6f35117..d9ef10c51 100644
--- a/examples/popen/popen_main.c
+++ b/examples/popen/popen_main.c
@@ -24,10 +24,11 @@
#include <nuttx/config.h>
+#include <errno.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
-#include <errno.h>
/****************************************************************************
* Public Functions
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 5a8cefcbb..611088702 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -24,15 +24,15 @@
#include <nuttx/config.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
+#include <debug.h>
+#include <errno.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <debug.h>
#include <nuttx/timers/watchdog.h>
diff --git a/industry/foc/fixed16/foc_ang_openloop.c b/industry/foc/fixed16/foc_ang_openloop.c
index d428c84e9..64f8194b8 100644
--- a/industry/foc/fixed16/foc_ang_openloop.c
+++ b/industry/foc/fixed16/foc_ang_openloop.c
@@ -27,6 +27,7 @@
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/fixed16/foc_angle.h"
diff --git a/industry/foc/fixed16/foc_angle.c b/industry/foc/fixed16/foc_angle.c
index ee5ad8e03..d6428acfc 100644
--- a/industry/foc/fixed16/foc_angle.c
+++ b/industry/foc/fixed16/foc_angle.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/fixed16/foc_angle.h"
diff --git a/industry/foc/fixed16/foc_handler.c b/industry/foc/fixed16/foc_handler.c
index 536d4e712..976904846 100644
--- a/industry/foc/fixed16/foc_handler.c
+++ b/industry/foc/fixed16/foc_handler.c
@@ -27,6 +27,7 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#include <unistd.h>
#include "industry/foc/foc_log.h"
diff --git a/industry/foc/fixed16/foc_model.c b/industry/foc/fixed16/foc_model.c
index 8540dee6a..2351e0b75 100644
--- a/industry/foc/fixed16/foc_model.c
+++ b/industry/foc/fixed16/foc_model.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/foc_common.h"
diff --git a/industry/foc/fixed16/foc_routine.c b/industry/foc/fixed16/foc_routine.c
index bba1e614e..0a41e2760 100644
--- a/industry/foc/fixed16/foc_routine.c
+++ b/industry/foc/fixed16/foc_routine.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/fixed16/foc_routine.h"
diff --git a/industry/foc/fixed16/foc_velocity.c b/industry/foc/fixed16/foc_velocity.c
index 59b0679ba..74d34454c 100644
--- a/industry/foc/fixed16/foc_velocity.c
+++ b/industry/foc/fixed16/foc_velocity.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/fixed16/foc_velocity.h"
diff --git a/industry/foc/float/foc_ang_openloop.c b/industry/foc/float/foc_ang_openloop.c
index fe75dbf9a..44122025a 100644
--- a/industry/foc/float/foc_ang_openloop.c
+++ b/industry/foc/float/foc_ang_openloop.c
@@ -27,6 +27,7 @@
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/float/foc_angle.h"
diff --git a/industry/foc/float/foc_angle.c b/industry/foc/float/foc_angle.c
index bbc0bd643..05f4db16f 100644
--- a/industry/foc/float/foc_angle.c
+++ b/industry/foc/float/foc_angle.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/float/foc_angle.h"
diff --git a/industry/foc/float/foc_handler.c b/industry/foc/float/foc_handler.c
index a446537f9..8d8703ef2 100644
--- a/industry/foc/float/foc_handler.c
+++ b/industry/foc/float/foc_handler.c
@@ -27,6 +27,7 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#include <unistd.h>
#include "industry/foc/foc_log.h"
diff --git a/industry/foc/float/foc_model.c b/industry/foc/float/foc_model.c
index d46e0b474..97e0b2a86 100644
--- a/industry/foc/float/foc_model.c
+++ b/industry/foc/float/foc_model.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/foc_common.h"
diff --git a/industry/foc/float/foc_routine.c b/industry/foc/float/foc_routine.c
index 767fb1873..2e6081379 100644
--- a/industry/foc/float/foc_routine.c
+++ b/industry/foc/float/foc_routine.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/float/foc_routine.h"
diff --git a/industry/foc/float/foc_velocity.c b/industry/foc/float/foc_velocity.c
index 4a5b7ca86..0ffad5c54 100644
--- a/industry/foc/float/foc_velocity.c
+++ b/industry/foc/float/foc_velocity.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "industry/foc/foc_log.h"
#include "industry/foc/float/foc_velocity.h"
diff --git a/system/nxlooper/nxlooper.c b/system/nxlooper/nxlooper.c
index b663b5e70..452dd6d18 100644
--- a/system/nxlooper/nxlooper.c
+++ b/system/nxlooper/nxlooper.c
@@ -24,21 +24,21 @@
#include <nuttx/config.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <stdint.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
#include <stdbool.h>
+#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/types.h>
#include <unistd.h>
#include <nuttx/audio/audio.h>
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 1e3b979c6..57d0ec71f 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -24,9 +24,21 @@
#include <nuttx/config.h>
-#include <sys/types.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
#include <sys/ioctl.h>
-
+#include <sys/types.h>
+#include <unistd.h>
#ifdef CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT
# include <sys/time.h>
# include <sys/socket.h>
@@ -34,19 +46,6 @@
# include <netdb.h>
#endif
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
-#include <unistd.h>
-
#include <netutils/netlib.h>
#include <nuttx/audio/audio.h>
diff --git a/system/nxplayer/nxplayer_mp3.c b/system/nxplayer/nxplayer_mp3.c
index dc7f07809..7f62241a5 100644
--- a/system/nxplayer/nxplayer_mp3.c
+++ b/system/nxplayer/nxplayer_mp3.c
@@ -22,11 +22,13 @@
* Included Files
****************************************************************************/
-#include <sys/types.h>
+#include <nuttx/config.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
#include <unistd.h>
#include <nuttx/audio/audio.h>
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index f85f1b5bb..fc6b21e8b 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -24,23 +24,24 @@
#include <nuttx/config.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <stdint.h>
+#include <assert.h>
+#include <debug.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
#include <stdbool.h>
+#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <strings.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <debug.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
#include <unistd.h>
#include <nuttx/audio/audio.h>
+
#include "system/nxrecorder.h"
/****************************************************************************
diff --git a/testing/ostest/suspend.c b/testing/ostest/suspend.c
index 4236250a7..ea640fbb1 100644
--- a/testing/ostest/suspend.c
+++ b/testing/ostest/suspend.c
@@ -22,8 +22,11 @@
* Included Files
****************************************************************************/
+#include <nuttx/config.h>
+
#include <assert.h>
#include <errno.h>
+#include <pthread.h>
#include <sched.h>
#include <semaphore.h>
#include <signal.h>