mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Style cleanups.

Browse Source 
X-MFC-after:	Already MFCed to RELENG_6 by accident.
This commit is contained in:
Pawel Jakub Dawidek 2006-01-18 11:03:20 +00:00
parent 90742659d7
commit 481b55b1e3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=154513
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/geom/label/g_label_ntfs.c
View File

@ -45,22 +45,22 @@ g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size)
{
struct g_provider *pp;
struct bootfile *bf;
struct attr *atr;
char *filerecp = NULL, *ap, vnchar;
struct filerec *fr;
char mftrecsz;
int recsize;
int j;
struct attr *atr;
off_t voloff;
char *filerecp, *ap;
char mftrecsz, vnchar;
int recsize, j;
g_topology_assert_not();
pp = cp->provider;
label[0] = '\0';
pp = cp->provider;
filerecp = NULL;
bf = (struct bootfile *)g_read_data(cp, 0, pp->sectorsize, NULL);
if (bf == NULL || strncmp(bf->bf_sysid, "NTFS ", 8) != 0) {
if (bf == NULL || strncmp(bf->bf_sysid, "NTFS ", 8) != 0)
goto done;
}
mftrecsz = (char)bf->bf_mftrecsz;
recsize = (mftrecsz > 0) ? (mftrecsz * bf->bf_bps * bf->bf_spc) : (1 << -mftrecsz);
@ -75,15 +75,14 @@ g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size)
filerecp = g_read_data(cp, voloff, recsize, NULL);
if (filerecp == NULL)
goto done;
fr = (struct filerec *)filerecp;
if(fr->fr_fixup.fh_magic != NTFS_FILEMAGIC){
label[0] = 0;
if (fr->fr_fixup.fh_magic != NTFS_FILEMAGIC)
goto done;
}
for (ap = filerecp + fr->fr_attroff; atr = (struct attr *)ap, atr->a_hdr.a_type != -1; ap += atr->a_hdr.reclen) {
for (ap = filerecp + fr->fr_attroff;
atr = (struct attr *)ap, atr->a_hdr.a_type != -1;
ap += atr->a_hdr.reclen) {
if (atr->a_hdr.a_type == NTFS_A_VOLUMENAME) {
if(atr->a_r.a_datalen >= size *2){
label[0] = 0;
@ -95,7 +94,7 @@ g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size)
*/
for (j = 0; j < atr->a_r.a_datalen; j++) {
vnchar = *(ap + atr->a_r.a_dataoff + j);
if ((j & 1)) {
if (j & 1) {
if (vnchar) {
label[0] = 0;
goto done;
@ -113,8 +112,6 @@ g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size)
g_free(bf);
if (filerecp != NULL)
g_free(filerecp);
return;
}
const struct g_label_desc g_label_ntfs = {