d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanups to ntfs code

Browse Source 
bzero -> memset
rename variables to avoid shadowing.

PR:		142401
Obtained from:	NetBSD
Approved by	jhb (mentor)
This commit is contained in:
pfg 2012-01-03 19:09:01 +00:00
parent e7e5b53bf1
commit 02096cd0ef
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/fs/ntfs/ntfs_compr.c
View File

@ -42,7 +42,7 @@
int
ntfs_uncompblock(
u_int8_t * buf,
u_int8_t * dbuf,
u_int8_t * cbuf)
{
u_int32_t ctag;
@ -60,8 +60,8 @@ ntfs_uncompblock(
dprintf(("ntfs_uncompblock: len: %x instead of %d\n",
len, 0xfff));
}
memcpy(buf, cbuf + 2, len + 1);
bzero(buf + len + 1, NTFS_COMPBLOCK_SIZE - 1 - len);
memcpy(dbuf, cbuf + 2, len + 1);
memset(dbuf + len + 1, 0, NTFS_COMPBLOCK_SIZE - 1 - len);
return len + 3;
}
cpos = 2;
@ -78,12 +78,12 @@ ntfs_uncompblock(
boff = -1 - (GET_UINT16(cbuf + cpos) >> dshift);
blen = 3 + (GET_UINT16(cbuf + cpos) & lmask);
for (j = 0; (j < blen) && (pos < NTFS_COMPBLOCK_SIZE); j++) {
buf[pos] = buf[pos + boff];
dbuf[pos] = dbuf[pos + boff];
pos++;
}
cpos += 2;
} else {
buf[pos++] = cbuf[cpos++];
dbuf[pos++] = cbuf[cpos++];
}
ctag >>= 1;
}

4
sys/fs/ntfs/ntfs_subr.c
View File

@ -1636,7 +1636,7 @@ ntfs_readntvattr_plain(
for(; remains; remains--)
uiomove("", 1, uio);
} else
bzero(data, tocopy);
memset(data, 0, tocopy);
data = data + tocopy;
}
cnt++;
@ -1783,7 +1783,7 @@ ntfs_readattr(
uiomove("", 1, uio);
}
else
bzero(data, tocopy);
memset(data, 0, tocopy);
} else {
error = ntfs_uncompunit(ntmp, uup, cup);
if (error)