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 2022/07/22 03:00:01 UTC
[incubator-nuttx] branch master updated: Fixed path calculation in BBS RAM.
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.git
The following commit(s) were added to refs/heads/master by this push:
new 30f8d33bca Fixed path calculation in BBS RAM.
30f8d33bca is described below
commit 30f8d33bca7fb6273f5c5e5643109c91e8220443
Author: Fotis Panagiotopoulos <f....@gmail.com>
AuthorDate: Thu Jul 21 22:24:47 2022 +0300
Fixed path calculation in BBS RAM.
---
arch/arm/src/stm32/stm32_bbsram.c | 8 ++------
arch/arm/src/stm32f7/stm32_bbsram.c | 8 ++------
arch/arm/src/stm32h7/stm32_bbsram.c | 8 ++------
arch/renesas/src/rx65n/rx65n_sbram.c | 8 ++------
4 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c
index 95db0e55c8..395e6d5c98 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -742,7 +742,6 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
{
int i;
int fcnt;
- char path[32];
char devname[32];
int ret = OK;
@@ -753,7 +752,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
}
i = strlen(devpath);
- if (i == 0 || i > sizeof(path) + 3)
+ if (i == 0 || i > sizeof(devname) - 3)
{
return -EINVAL;
}
@@ -782,12 +781,9 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
fcnt = stm32_bbsram_probe(sizes, g_bbsram);
- strncpy(path, devpath, sizeof(path));
- strcat(path, "%d");
-
for (i = 0; i < fcnt && ret >= OK; i++)
{
- snprintf(devname, sizeof(devname), path, i);
+ snprintf(devname, sizeof(devname), "%s%d", devpath, i);
ret = register_driver(devname, &stm32_bbsram_fops, 0666, &g_bbsram[i]);
}
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c
index 5d3b4b8929..b2b583e1ef 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -742,7 +742,6 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
{
int i;
int fcnt;
- char path[32];
char devname[32];
int ret = OK;
@@ -753,7 +752,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
}
i = strlen(devpath);
- if (i == 0 || i > sizeof(path) + 3)
+ if (i == 0 || i > sizeof(devname) - 3)
{
return -EINVAL;
}
@@ -782,12 +781,9 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
fcnt = stm32_bbsram_probe(sizes, g_bbsram);
- strncpy(path, devpath, sizeof(path));
- strcat(path, "%d");
-
for (i = 0; i < fcnt && ret >= OK; i++)
{
- snprintf(devname, sizeof(devname), path, i);
+ snprintf(devname, sizeof(devname), "%s%d", devpath, i);
ret = register_driver(devname, &stm32_bbsram_fops, 0666, &g_bbsram[i]);
}
diff --git a/arch/arm/src/stm32h7/stm32_bbsram.c b/arch/arm/src/stm32h7/stm32_bbsram.c
index 042a855695..815c18505a 100644
--- a/arch/arm/src/stm32h7/stm32_bbsram.c
+++ b/arch/arm/src/stm32h7/stm32_bbsram.c
@@ -800,7 +800,6 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
{
int i;
int fcnt;
- char path[32];
char devname[32];
int ret = OK;
@@ -811,7 +810,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
}
i = strlen(devpath);
- if (i == 0 || i > sizeof(path) + 3)
+ if (i == 0 || i > sizeof(devname) - 3)
{
return -EINVAL;
}
@@ -853,12 +852,9 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
fcnt = stm32_bbsram_probe(sizes, g_bbsram);
- strncpy(path, devpath, sizeof(path));
- strcat(path, "%d");
-
for (i = 0; i < fcnt && ret >= OK; i++)
{
- snprintf(devname, sizeof(devname), path, i);
+ snprintf(devname, sizeof(devname), "%s%d", devpath, i);
ret = register_driver(devname, &stm32_bbsram_fops, 0666, &g_bbsram[i]);
}
diff --git a/arch/renesas/src/rx65n/rx65n_sbram.c b/arch/renesas/src/rx65n/rx65n_sbram.c
index f47887ef99..cb207a33c0 100644
--- a/arch/renesas/src/rx65n/rx65n_sbram.c
+++ b/arch/renesas/src/rx65n/rx65n_sbram.c
@@ -671,7 +671,6 @@ int rx65n_sbraminitialize(char *devpath, int *sizes)
{
int i;
int fcnt;
- char path[32];
char devname[32];
int ret = OK;
@@ -682,7 +681,7 @@ int rx65n_sbraminitialize(char *devpath, int *sizes)
}
i = strlen(devpath);
- if (i == 0 || i > sizeof(path) + 3)
+ if (i == 0 || i > sizeof(devname) - 3)
{
return -EINVAL;
}
@@ -703,12 +702,9 @@ int rx65n_sbraminitialize(char *devpath, int *sizes)
fcnt = rx65n_sbram_probe(sizes, g_sbram);
- strncpy(path, devpath, sizeof(path));
- strcat(path, "%d");
-
for (i = 0; i < fcnt && ret >= OK; i++)
{
- snprintf(devname, sizeof(devname), path, i);
+ snprintf(devname, sizeof(devname), "%s%d", devpath, i);
ret = register_driver(devname, &rx65n_sbram_fops, 0666, &g_sbram[i]);
}