Skip to content

M
Mock Turtle
Commit 2da283e7 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:lib: use sizeof to get path[] size 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 03824c80
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
software/lib/libmockturtle.c
View file @ 2da283e7
...@@ -185,7 +185,7 @@ void trtl_list_free(char **list) ...@@ -185,7 +185,7 @@ void trtl_list_free(char **list)
struct trtl_dev *trtl_open(const char *device) struct trtl_dev *trtl_open(const char *device)
{ {
struct trtl_desc *trtl; struct trtl_desc *trtl;
char path[TRTL_PATH_LEN + TRTL_NAME_LEN]; char path[256];
int i, err, k, fd; int i, err, k, fd;
struct stat sb; struct stat sb;
...@@ -194,12 +194,12 @@ struct trtl_dev *trtl_open(const char *device) ...@@ -194,12 +194,12 @@ struct trtl_dev *trtl_open(const char *device)
return NULL; return NULL;
strncpy(trtl->name, device, TRTL_NAME_LEN); strncpy(trtl->name, device, TRTL_NAME_LEN);
snprintf(path, TRTL_PATH_LEN + TRTL_NAME_LEN, "/dev/%s", trtl->name); snprintf(path, sizeof(path), "/dev/%s", trtl->name);
err = stat(path, &sb); err = stat(path, &sb);
if (!err) { if (!err) {
strncpy(trtl->path, "/dev", TRTL_PATH_LEN); strncpy(trtl->path, "/dev", TRTL_PATH_LEN);
} else { } else {
snprintf(path, TRTL_PATH_LEN + TRTL_NAME_LEN, snprintf(path, sizeof(path),
"/dev/mockturtle/%s", trtl->name); "/dev/mockturtle/%s", trtl->name);
err = stat(path, &sb); err = stat(path, &sb);
if (err) if (err)
...@@ -207,7 +207,7 @@ struct trtl_dev *trtl_open(const char *device) ...@@ -207,7 +207,7 @@ struct trtl_dev *trtl_open(const char *device)
strncpy(trtl->path, "/dev/mockturtle", TRTL_PATH_LEN); strncpy(trtl->path, "/dev/mockturtle", TRTL_PATH_LEN);
} }
snprintf(path, TRTL_SYSFS_PATH_LEN, snprintf(path, sizeof(path),
"/sys/class/mockturtle/%s/config-rom", "/sys/class/mockturtle/%s/config-rom",
trtl->name); trtl->name);
...@@ -224,7 +224,7 @@ struct trtl_dev *trtl_open(const char *device) ...@@ -224,7 +224,7 @@ struct trtl_dev *trtl_open(const char *device)
for (i = 0; i < trtl->cfgrom.n_cpu; ++i) { for (i = 0; i < trtl->cfgrom.n_cpu; ++i) {
trtl->fd_cpu[i] = -1; trtl->fd_cpu[i] = -1;
for (k = 0; k < trtl->cfgrom.n_hmq[i]; ++k) { for (k = 0; k < trtl->cfgrom.n_hmq[i]; ++k) {
snprintf(path, 64, "%s/%s-%02d-%02d", snprintf(path, sizeof(path), "%s/%s-%02d-%02d",
trtl->path, trtl->name, i, k); trtl->path, trtl->name, i, k);
fd = open(path, O_RDWR); fd = open(path, O_RDWR);
if (fd < 0) if (fd < 0)
...@@ -678,12 +678,11 @@ static int trtl_dev_open(struct trtl_desc *wdesc) ...@@ -678,12 +678,11 @@ static int trtl_dev_open(struct trtl_desc *wdesc)
if (wdesc->fd_dev < 0) { if (wdesc->fd_dev < 0) {
char path[64]; char path[64];
snprintf(path, 64, "%s/%s", wdesc->path, wdesc->name); snprintf(path, sizeof(path), "%s/%s", wdesc->path, wdesc->name);
wdesc->fd_dev = open(path, O_RDWR); wdesc->fd_dev = open(path, O_RDWR);
if (wdesc->fd_dev < 0) if (wdesc->fd_dev < 0)
return -1; return -1;
} }
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment