diff options
| author | bde <bde@FreeBSD.org> | 1999-09-13 14:12:23 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-09-13 14:12:23 +0000 |
| commit | 5824d128190e8673ab2dc87f7a4867d67e70a471 (patch) | |
| tree | d12d0146e518f72ba9e2b3be71dc835b64307c73 | |
| parent | e4c61ea6e2933ecb88a4d85538e120877cba2220 (diff) | |
| download | FreeBSD-src-5824d128190e8673ab2dc87f7a4867d67e70a471.zip FreeBSD-src-5824d128190e8673ab2dc87f7a4867d67e70a471.tar.gz | |
Const poisoning from d_name.
Fixed some style bugs in recent changes.
| -rw-r--r-- | sys/kern/subr_diskslice.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 6a31e11..439496c 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -523,8 +523,7 @@ dsioctl(dev, cmd, data, flags, sspp) part = 0; openmask; openmask >>= 1, part++) { if (!(openmask & 1)) continue; - error = dsopen( - dkmodslice(dkmodpart(dev, part), + error = dsopen(dkmodslice(dkmodpart(dev, part), slice), S_IFBLK, ssp->dss_oflags, sspp, lp); @@ -540,8 +539,7 @@ dsioctl(dev, cmd, data, flags, sspp) part = 0; openmask; openmask >>= 1, part++) { if (!(openmask & 1)) continue; - error = dsopen( - dkmodslice(dkmodpart(dev, part), + error = dsopen(dkmodslice(dkmodpart(dev, part), slice), S_IFCHR, ssp->dss_oflags, sspp, lp); @@ -669,7 +667,7 @@ dsname(dev, unit, slice, part, partname) char *partname; { static char name[32]; - char *dname; + const char *dname; dname = devsw(dev)->d_name; if (strlen(dname) > 16) @@ -890,7 +888,8 @@ dssize(dev, sspp) ssp = *sspp; if (ssp == NULL || slice >= ssp->dss_nslices || !(ssp->dss_slices[slice].ds_bopenmask & (1 << part))) { - if (devsw(dev)->d_open(dev, FREAD, S_IFBLK, (struct proc *)NULL) != 0) + if (devsw(dev)->d_open(dev, FREAD, S_IFBLK, + (struct proc *)NULL) != 0) return (-1); devsw(dev)->d_close(dev, FREAD, S_IFBLK, (struct proc *)NULL); ssp = *sspp; |
