Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1185 → Rev 1186

/FreeBSD/geom_nbsd/trunk/src/geom_nbsd.c
128,7 → 128,8
 
/* Don't munge open partitions. */
for (i = 0; i < dl->d_npartitions; i++) {
if(!useable[i]) continue;
if (!useable[i])
continue;
 
ppp = &dl->d_partitions[i];
o = (off_t)ppp->p_offset * dl->d_secsize;
143,7 → 144,8
 
/* Look good, go for it... */
for (u = 0; u < gsp->nslice; u++) {
if(!useable[u]) continue;
if (!useable[u])
continue;
 
ppp = &dl->d_partitions[u];
o = (off_t)ppp->p_offset * dl->d_secsize;
150,9 → 152,7
if (o == 0)
o = rawoffset;
g_slice_config(gp, u, G_SLICE_CONFIG_SET,
o - rawoffset,
(off_t)ppp->p_size * dl->d_secsize,
dl->d_secsize,
o - rawoffset, (off_t)ppp->p_size * dl->d_secsize, dl->d_secsize,
"%s%c", gp->name, 'a' + u);
}
 
451,7 → 451,7
.taste = g_nbsd_taste,
.ctlreq = g_nbsd_config,
.dumpconf = g_nbsd_dumpconf,
.ioctl = g_nbsd_ioctl,
.ioctl = g_nbsd_ioctl
};
 
DECLARE_GEOM_CLASS(g_nbsd_class, g_nbsd);
/FreeBSD/geom_nbsd/trunk/src/geom_nbsd_enc.c
72,19 → 72,19
 
d->d_magic = le32dec(ptr + 0);
if (d->d_magic != DISKMAGIC)
return(EINVAL);
return (EINVAL);
 
d->d_magic2 = le32dec(ptr + 132);
if (d->d_magic2 != DISKMAGIC) {
return(EINVAL);
return (EINVAL);
}
 
d->d_npartitions = le16dec(ptr + 138);
if (maxpart > NBSD_MAXPARTITIONS) {
return(EINVAL);
return (EINVAL);
}
if (d->d_npartitions > maxpart) {
return(EINVAL);
return (EINVAL);
}
 
pe = ptr + 148 + 16 * d->d_npartitions;
92,7 → 92,7
for (p = ptr; p < pe; p += 2)
sum ^= le16dec(p);
if (sum != 0) {
return(EINVAL);
return (EINVAL);
}
 
d->d_type = le16dec(ptr + 4);
131,6 → 131,6
d->d_sbsize = le32dec(ptr + 144);
for (i = 0; i < d->d_npartitions; i++)
nbsd_partition_le_dec(ptr + 148 + 16 * i, &d->d_partitions[i]);
return(0);
return (0);
}