summaryrefslogtreecommitdiffstats
path: root/sbin/geom
diff options
context:
space:
mode:
authorivoras <ivoras@FreeBSD.org>2008-08-09 16:47:30 +0000
committerivoras <ivoras@FreeBSD.org>2008-08-09 16:47:30 +0000
commitb5c57a6aa51e6de4db7f25fb136dc2c924f983ba (patch)
tree7392af6e80eba683ee1f25cc7e1c7ac951d1ba81 /sbin/geom
parentf29ac4f3c5a4e3953fb279c177e4894b30f4dbee (diff)
downloadFreeBSD-src-b5c57a6aa51e6de4db7f25fb136dc2c924f983ba.zip
FreeBSD-src-b5c57a6aa51e6de4db7f25fb136dc2c924f983ba.tar.gz
Clean up of dead code and possible unassigned variable usage.
Found by: LLVM/Clang Static Checker Approved by: gnn (mentor)
Diffstat (limited to 'sbin/geom')
-rw-r--r--sbin/geom/class/virstor/geom_virstor.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c
index b1d2cb4..b651555 100644
--- a/sbin/geom/class/virstor/geom_virstor.c
+++ b/sbin/geom/class/virstor/geom_virstor.c
@@ -157,7 +157,6 @@ my_g_metadata_store(const char *name, u_char *md, size_t size)
off_t mediasize;
u_char *sector;
int error, fd;
- ssize_t abc;
pathgen(name, path, sizeof(path));
sector = NULL;
@@ -183,7 +182,7 @@ my_g_metadata_store(const char *name, u_char *md, size_t size)
goto out;
}
bcopy(md, sector, size);
- if ((abc = pwrite(fd, sector, sectorsize, mediasize - sectorsize)) !=
+ if (pwrite(fd, sector, sectorsize, mediasize - sectorsize) !=
(ssize_t)sectorsize) {
error = errno;
goto out;
@@ -273,7 +272,7 @@ virstor_label(struct gctl_req *req)
(size_t)(md.md_virsize/(1024 * 1024)));
}
- msize = secsize = ssize = 0;
+ msize = secsize = 0;
for (i = 1; i < (unsigned)nargs; i++) {
snprintf(param, sizeof(param), "arg%u", i);
name = gctl_get_ascii(req, param);
@@ -291,6 +290,11 @@ virstor_label(struct gctl_req *req)
}
}
+ if (secsize == 0) {
+ gctl_error(req, "Device not specified");
+ return;
+ }
+
if (md.md_chunk_size % secsize != 0) {
fprintf(stderr, "Error: chunk size is not a multiple of sector "
"size.");
OpenPOWER on IntegriCloud