summaryrefslogtreecommitdiffstats
path: root/sys/geom/geom_sunlabel.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-04-09 15:17:59 +0000
committerphk <phk@FreeBSD.org>2002-04-09 15:17:59 +0000
commitc2f17d16c728a0248466b433fc6c8ad52023ac3d (patch)
tree80167139c3f1b14de753f1e6029b8d55912daa5d /sys/geom/geom_sunlabel.c
parent7071088894de2c78b786fc901daff03b42c1ec50 (diff)
downloadFreeBSD-src-c2f17d16c728a0248466b433fc6c8ad52023ac3d.zip
FreeBSD-src-c2f17d16c728a0248466b433fc6c8ad52023ac3d.tar.gz
Various stylistic nit picking.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_sunlabel.c')
-rw-r--r--sys/geom/geom_sunlabel.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index d31dad3..78d9c87 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -92,7 +92,7 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
int error, i, j, npart;
u_char *buf;
struct g_sunlabel_softc *ms;
- u_int secsize, u, v, csize;
+ u_int sectorsize, u, v, csize;
off_t mediasize;
g_trace(G_T_TOPOLOGY, "g_sunlabel_taste(%s,%s)", mp->name, pp->name);
@@ -109,12 +109,12 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
while (1) { /* a trick to allow us to use break */
if (gp->rank != 2 && flags == G_TF_NORMAL)
break;
- j = sizeof secsize;
- error = g_io_getattr("GEOM::sectorsize", cp, &j, &secsize);
+ j = sizeof sectorsize;
+ error = g_io_getattr("GEOM::sectorsize", cp, &j, &sectorsize);
if (error) {
- secsize = 512;
+ sectorsize = 512;
printf("g_sunlabel_taste: error %d Sectors are %d bytes\n",
- error, secsize);
+ error, sectorsize);
}
j = sizeof mediasize;
error = g_io_getattr("GEOM::mediasize", cp, &j, &mediasize);
@@ -123,7 +123,7 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
printf("g_error %d Mediasize is %lld bytes\n",
error, (long long)mediasize);
}
- buf = g_read_data(cp, 0, secsize, &error);
+ buf = g_read_data(cp, 0, sectorsize, &error);
if (buf == NULL || error != 0)
break;
OpenPOWER on IntegriCloud