diff options
| author | ae <ae@FreeBSD.org> | 2010-10-09 20:20:27 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2010-10-09 20:20:27 +0000 |
| commit | ab9dd3ef5837b16243ea56cca50dce6f2709cb92 (patch) | |
| tree | 724bc9f6b5d1845293adad1d0f93b93234459cf7 /sbin/geom/class/virstor | |
| parent | 0061fd332ca7c71fd44b7390a2eb33e53f4539ce (diff) | |
| download | FreeBSD-src-ab9dd3ef5837b16243ea56cca50dce6f2709cb92.zip FreeBSD-src-ab9dd3ef5837b16243ea56cca50dce6f2709cb92.tar.gz | |
Replace strlen(_PATH_DEV) with sizeof(_PATH_DEV) - 1.
Suggested by: kib
Approved by: kib (mentor)
MFC after: 5 days
Diffstat (limited to 'sbin/geom/class/virstor')
| -rw-r--r-- | sbin/geom/class/virstor/geom_virstor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c index b08a8b9..be9a467 100644 --- a/sbin/geom/class/virstor/geom_virstor.c +++ b/sbin/geom/class/virstor/geom_virstor.c @@ -144,7 +144,7 @@ static void pathgen(const char *name, char *path, size_t size) { - if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) != 0) + if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) != 0) snprintf(path, size, "%s%s", _PATH_DEV, name); else strlcpy(path, name, size); @@ -375,7 +375,7 @@ virstor_label(struct gctl_req *req) fflush(stdout); } - if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) fd = open(name, O_RDWR); else { sprintf(param, "%s%s", _PATH_DEV, name); @@ -453,8 +453,8 @@ virstor_label(struct gctl_req *req) bzero(md.provider, sizeof(md.provider)); else { /* convert "/dev/something" to "something" */ - if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) { - strlcpy(md.provider, name + strlen(_PATH_DEV), + if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) { + strlcpy(md.provider, name + sizeof(_PATH_DEV) - 1, sizeof(md.provider)); } else strlcpy(md.provider, name, sizeof(md.provider)); @@ -509,7 +509,7 @@ virstor_clear(struct gctl_req *req) "Not fully done (can't clear metadata)."); continue; } - if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) fd = open(name, O_RDWR); else { sprintf(param, "%s%s", _PATH_DEV, name); |
