i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTFS: Codestyle cleanup

Browse Source
This commit is contained in:
Gerasim Troeglazov
2014-02-01 10:36:34 +00:00
parent 9bd08d10ab
commit 6882e5ef83
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/ntfsdir.c
+5 -7
View File
@@ -62,7 +62,7 @@ _ntfs_dirent_filler(void *_dirent, const ntfschar *name,
memcpy(new_entry->ent->d_name,filename, len + 1); memcpy(new_entry->ent->d_name,filename, len + 1);
new_entry->ent->d_reclen = sizeof(struct dirent) + len; new_entry->ent->d_reclen = sizeof(struct dirent) + len;
if(cookie->cache_root == NULL || cookie->entry == NULL) { if (cookie->cache_root == NULL || cookie->entry == NULL) {
cookie->cache_root = new_entry; cookie->cache_root = new_entry;
cookie->entry = cookie->cache_root; cookie->entry = cookie->cache_root;
cookie->entry->next = NULL; cookie->entry->next = NULL;
@@ -94,7 +94,6 @@ fs_free_dircookie(fs_volume *_vol, fs_vnode *vnode, void *_cookie)
cache_entry *entry = cookie->cache_root; cache_entry *entry = cookie->cache_root;
while (entry != NULL) { while (entry != NULL) {
cache_entry *next = entry->next; cache_entry *next = entry->next;
if (entry->ent != NULL)
free(entry->ent); free(entry->ent);
free(entry); free(entry);
entry = next; entry = next;
@@ -189,23 +188,23 @@ fs_readdir(fs_volume *_vol, fs_vnode *_node, void *_cookie, struct dirent *buf,
goto exit; goto exit;
} }
if(cookie->cache_root == NULL) { if (cookie->cache_root == NULL) {
cookie->entry = NULL; cookie->entry = NULL;
result = ntfs_readdir(ni, &cookie->pos, cookie, result = ntfs_readdir(ni, &cookie->pos, cookie,
(ntfs_filldir_t)_ntfs_dirent_filler); (ntfs_filldir_t)_ntfs_dirent_filler);
cookie->entry = cookie->cache_root; cookie->entry = cookie->cache_root;
if(result) { if (result) {
result = ENOENT; result = ENOENT;
goto exit; goto exit;
} }
} }
if(cookie->entry == NULL) { if (cookie->entry == NULL) {
result = ENOENT; result = ENOENT;
goto exit; goto exit;
} }
if(cookie->entry->ent == NULL) { if (cookie->entry->ent == NULL) {
result = ENOENT; result = ENOENT;
goto exit; goto exit;
} }
@@ -254,7 +253,6 @@ fs_rewinddir(fs_volume *_vol, fs_vnode *_node, void *_cookie)
cache_entry *entry = cookie->cache_root; cache_entry *entry = cookie->cache_root;
while (entry != NULL) { while (entry != NULL) {
cache_entry *next = entry->next; cache_entry *next = entry->next;
if (entry->ent != NULL)
free(entry->ent); free(entry->ent);
free(entry); free(entry);
entry = next; entry = next;
src/add-ons/kernel/file_systems/ntfs/volume_util.c
+9 -9
View File
@@ -46,9 +46,9 @@ static uint8 ntfs_count_bits(unsigned char byte, unsigned char shift)
int i; int i;
unsigned char counter = 0; unsigned char counter = 0;
if(shift < 8) { if (shift < 8) {
for(i=0; i<shift; i++) { for (i=0; i<shift; i++) {
if(!(byte & 0x80)) if (!(byte & 0x80))
counter++; counter++;
byte = byte << 1; byte = byte << 1;
} }
@@ -81,21 +81,21 @@ int ntfs_calc_free_space(nspace *_ns)
return -1; return -1;
buf = (unsigned char*)ntfs_malloc(vol->cluster_size); buf = (unsigned char*)ntfs_malloc(vol->cluster_size);
if(!buf) if (buf == NULL)
goto exit; goto exit;
while( pos < data->data_size) { while (pos < data->data_size) {
if( pos % vol->cluster_size == 0) { if (pos % vol->cluster_size == 0) {
readed = ntfs_attr_pread(vol->lcnbmp_na, pos, readed = ntfs_attr_pread(vol->lcnbmp_na, pos,
min(data->data_size - pos, vol->cluster_size), buf); min(data->data_size - pos, vol->cluster_size), buf);
if(readed < B_NO_ERROR) if (readed < B_NO_ERROR)
goto error; goto error;
if(readed != min(data->data_size - pos, vol->cluster_size)) if (readed != min(data->data_size - pos, vol->cluster_size))
goto error; goto error;
} }
free_clusters += ntfs_count_bits( buf[pos%vol->cluster_size], free_clusters += ntfs_count_bits( buf[pos%vol->cluster_size],
min( (vol->nr_clusters) - (pos * 8), 8)); min((vol->nr_clusters) - (pos * 8), 8));
pos++; pos++;
} }
error: error: