This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 6aa05b585 Replace strlen with sizeof for kconfig string
6aa05b585 is described below
commit 6aa05b585598f9e7dba7dc2beaf3ca7155f8a862
Author: Xiang Xiao <[email protected]>
AuthorDate: Fri Sep 1 11:00:38 2023 +0800
Replace strlen with sizeof for kconfig string
Signed-off-by: Xiang Xiao <[email protected]>
---
examples/udgram/udgram_client.c | 2 +-
examples/udgram/udgram_server.c | 2 +-
examples/ustream/ustream_client.c | 2 +-
examples/ustream/ustream_server.c | 2 +-
nshlib/nsh_fsutils.c | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/udgram/udgram_client.c b/examples/udgram/udgram_client.c
index 2dde6e610..c12d3f899 100644
--- a/examples/udgram/udgram_client.c
+++ b/examples/udgram/udgram_client.c
@@ -89,7 +89,7 @@ int main(int argc, FAR char *argv[])
/* Set up the server address */
- addrlen = strlen(CONFIG_EXAMPLES_UDGRAM_ADDR) + 1;
+ addrlen = sizeof(CONFIG_EXAMPLES_UDGRAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
diff --git a/examples/udgram/udgram_server.c b/examples/udgram/udgram_server.c
index 4fab950f1..703baffa1 100644
--- a/examples/udgram/udgram_server.c
+++ b/examples/udgram/udgram_server.c
@@ -91,7 +91,7 @@ int main(int argc, FAR char *argv[])
/* Bind the socket to a local address */
- addrlen = strlen(CONFIG_EXAMPLES_UDGRAM_ADDR) + 1;
+ addrlen = sizeof(CONFIG_EXAMPLES_UDGRAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
diff --git a/examples/ustream/ustream_client.c
b/examples/ustream/ustream_client.c
index df3c5c264..baad92d45 100644
--- a/examples/ustream/ustream_client.c
+++ b/examples/ustream/ustream_client.c
@@ -78,7 +78,7 @@ int main(int argc, FAR char *argv[])
/* Connect the socket to the server */
- addrlen = strlen(CONFIG_EXAMPLES_USTREAM_ADDR) + 1;
+ addrlen = sizeof(CONFIG_EXAMPLES_USTREAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
diff --git a/examples/ustream/ustream_server.c
b/examples/ustream/ustream_server.c
index b5f5ccf57..8ed5f0cea 100644
--- a/examples/ustream/ustream_server.c
+++ b/examples/ustream/ustream_server.c
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
/* Bind the socket to a local address */
- addrlen = strlen(CONFIG_EXAMPLES_USTREAM_ADDR) + 1;
+ addrlen = sizeof(CONFIG_EXAMPLES_USTREAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
diff --git a/nshlib/nsh_fsutils.c b/nshlib/nsh_fsutils.c
index 5c72fe297..3babedfd3 100644
--- a/nshlib/nsh_fsutils.c
+++ b/nshlib/nsh_fsutils.c
@@ -142,7 +142,7 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char
*cmd,
{
#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
if (strncmp(filepath, CONFIG_NSH_PROC_MOUNTPOINT,
- strlen(CONFIG_NSH_PROC_MOUNTPOINT)) == 0)
+ sizeof(CONFIG_NSH_PROC_MOUNTPOINT) - 1) == 0)
{
nsh_error(vtbl,
"nsh: %s: Could not open %s (is procfs mounted?)\n",
@@ -386,7 +386,7 @@ int nsh_writefile(FAR struct nsh_vtbl_s *vtbl, FAR const
char *cmd,
{
#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
if (strncmp(filepath, CONFIG_NSH_PROC_MOUNTPOINT,
- strlen(CONFIG_NSH_PROC_MOUNTPOINT)) == 0)
+ sizeof(CONFIG_NSH_PROC_MOUNTPOINT) - 1) == 0)
{
nsh_error(vtbl,
"nsh: %s: Could not open %s (is procfs mounted?)\n",
@@ -445,7 +445,7 @@ int nsh_foreach_direntry(FAR struct nsh_vtbl_s *vtbl, FAR
const char *cmd,
#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
if (strncmp(dirpath, CONFIG_NSH_PROC_MOUNTPOINT,
- strlen(CONFIG_NSH_PROC_MOUNTPOINT)) == 0)
+ sizeof(CONFIG_NSH_PROC_MOUNTPOINT) - 1) == 0)
{
nsh_error(vtbl,
"nsh: %s: Could not open %s (is procfs mounted?)\n",
