[haiku-commits] haiku: hrev46800 - src/add-ons/kernel/file_systems/ntfs
- From: Gerasim Troeglazov <3deyes@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 1 Feb 2014 10:13:01 +0100 (CET)
hrev46800 adds 2 changesets to branch 'master'
old head: eefd86b752dc11c0bbc5a759864068d23259cbaf
new head: 1cbc486e1f09904ee18ea7dc9079f1fdfbbf908b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1cbc486+%5Eeefd86b
----------------------------------------------------------------------------
154570e: NTFS: Remove checking for NULL
1cbc486: NTFS: Code cleanup
[ Gerasim Troeglazov <3dEyes@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 42 insertions(+), 44 deletions(-)
.../kernel/file_systems/ntfs/fake_attributes.c | 2 +-
src/add-ons/kernel/file_systems/ntfs/fs_func.c | 25 +++++-----
src/add-ons/kernel/file_systems/ntfs/ntfs.h | 10 ++--
.../kernel/file_systems/ntfs/volume_util.c | 49 ++++++++++----------
############################################################################
Commit: 154570e8f95f4da5726fdb0fd6f7ef4d00806044
URL: http://cgit.haiku-os.org/haiku/commit/?id=154570e
Author: Gerasim Troeglazov <3dEyes@xxxxxxxxx>
Date: Sat Feb 1 07:03:11 2014 UTC
NTFS: Remove checking for NULL
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/ntfs/fs_func.c
b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
index cd383c1..051cea6 100644
--- a/src/add-ons/kernel/file_systems/ntfs/fs_func.c
+++ b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
@@ -147,8 +147,7 @@ ntfs_inode_lookup(fs_volume *_vol, ino_t parent, const char
*name)
else
ino = MREF(inum);
}
- if (uname != NULL)
- free(uname);
+ free(uname);
return (ino);
}
@@ -708,7 +707,7 @@ exit:
if (ni != NULL)
ntfs_inode_close(ni);
- if (result != B_OK && newNode != NULL)
+ if (result != B_OK)
free(newNode);
TRACE("fs_read_vnode - EXIT, result is %s\n", strerror(result));
@@ -1167,9 +1166,8 @@ exit:
if (dir_ni != NULL)
ntfs_inode_close(dir_ni);
-
- if (uname != NULL)
- free(uname);
+
+ free(uname);
TRACE("fs_create - EXIT, result is %s\n", strerror(result));
@@ -1480,8 +1478,8 @@ exit:
ntfs_attr_close(na);
if (ni != NULL)
ntfs_inode_close(ni);
- if (tempBuffer != NULL)
- free(tempBuffer);
+
+ free(tempBuffer);
TRACE("fs_readlink - EXIT, result is %s\n", strerror(result));
@@ -1573,10 +1571,9 @@ fs_create_symlink(fs_volume *_vol, fs_vnode *_dir, const
char *name,
exit:
if (dir_ni != NULL)
ntfs_inode_close(dir_ni);
- if (utarget != NULL)
- free(utarget);
- if (uname != NULL)
- free(uname);
+
+ free(utarget);
+ free(uname);
TRACE("fs_symlink - EXIT, result is %s\n", strerror(result));
@@ -1665,8 +1662,8 @@ fs_mkdir(fs_volume *_vol, fs_vnode *_dir, const char
*name, int perms)
exit:
if (dir_ni != NULL)
ntfs_inode_close(dir_ni);
- if (uname != NULL)
- free(uname);
+
+ free(uname);
TRACE("fs_mkdir - EXIT, result is %s\n", strerror(result));
############################################################################
Revision: hrev46800
Commit: 1cbc486e1f09904ee18ea7dc9079f1fdfbbf908b
URL: http://cgit.haiku-os.org/haiku/commit/?id=1cbc486
Author: Gerasim Troeglazov <3dEyes@xxxxxxxxx>
Date: Sat Feb 1 07:20:24 2014 UTC
NTFS: Code cleanup
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/ntfs/fake_attributes.c
b/src/add-ons/kernel/file_systems/ntfs/fake_attributes.c
index 39a3019..ebc02f4 100644
--- a/src/add-ons/kernel/file_systems/ntfs/fake_attributes.c
+++ b/src/add-ons/kernel/file_systems/ntfs/fake_attributes.c
@@ -57,7 +57,7 @@ status_t set_mime(vnode *node, const char *filename)
if (!strcasecmp(filename + namelen - ext_len, p->extension))
break;
}
- if(p->mime==NULL)
+ if(p->mime == NULL)
node->mime = kFailBackMime;
else
node->mime = p->mime;
diff --git a/src/add-ons/kernel/file_systems/ntfs/ntfs.h
b/src/add-ons/kernel/file_systems/ntfs/ntfs.h
index 16bbcf8..4cf395b 100644
--- a/src/add-ons/kernel/file_systems/ntfs/ntfs.h
+++ b/src/add-ons/kernel/file_systems/ntfs/ntfs.h
@@ -75,8 +75,10 @@ UNLOCK((vol)->vlock); \
}
typedef enum {
- NF_FreeClustersOutdate = (1 << 0), // Information about
amount of free clusters is outdated.
- NF_FreeMFTOutdate = (1 << 1), //
Information about amount of free MFT records is outdated.
+ // Information about amount of free clusters is outdated.
+ NF_FreeClustersOutdate = (1 << 0),
+ // Information about amount of free MFT records is outdated.
+ NF_FreeMFTOutdate = (1 << 1),
} ntfs_state_bits;
@@ -104,8 +106,8 @@ typedef struct attrdircookie {
ntfs_attr_search_ctx *ctx;
} attrdircookie;
-#define ntfs_mark_free_space_outdated(ns) (ns->state |=
(NF_FreeClustersOutdate | NF_FreeMFTOutdate));
-
+#define ntfs_mark_free_space_outdated(ns) \
+(ns->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate));
typedef struct nspace {
diff --git a/src/add-ons/kernel/file_systems/ntfs/volume_util.c
b/src/add-ons/kernel/file_systems/ntfs/volume_util.c
index 1c1b38e..a38f929 100644
--- a/src/add-ons/kernel/file_systems/ntfs/volume_util.c
+++ b/src/add-ons/kernel/file_systems/ntfs/volume_util.c
@@ -38,27 +38,25 @@
#include "ntfs.h"
#include "volume_util.h"
-static unsigned char ntfs_bits_table[] = { 4, 3, 3, 2, 3, 2, 2, 1, 3, 2,
2, 1, 2, 1, 1, 0 };
+static unsigned char ntfs_bits_table[] = { 4, 3, 3, 2, 3, 2, 2, 1,
+ 3, 2, 2, 1, 2, 1, 1, 0 };
static uint8 ntfs_count_bits(unsigned char byte, unsigned char shift)
{
int i;
unsigned char counter = 0;
- if(shift < 8)
- {
- for(i=0; i<shift; i++)
- {
- if(!(byte & 0x80))counter++;
- byte = byte << 1;
+ if(shift < 8) {
+ for(i=0; i<shift; i++) {
+ if(!(byte & 0x80))
+ counter++;
+ byte = byte << 1;
}
- }
- else
- {
+ } else {
counter += ntfs_bits_table[byte & 0x0F];
counter += ntfs_bits_table[(byte & 0xF0) >> 4];
- }
-
+ }
+
return counter;
}
@@ -73,34 +71,35 @@ int ntfs_calc_free_space(nspace *_ns)
size_t readed;
unsigned char *buf = NULL;
- if(ns== NULL || vol==NULL || data==NULL)
+ if (ns == NULL || vol == NULL || data == NULL)
return -1;
- if(vol->lcnbmp_na==NULL)
+ if (vol->lcnbmp_na == NULL)
return -1;
if (!(ns->state & NF_FreeClustersOutdate))
return -1;
buf = (unsigned char*)ntfs_malloc(vol->cluster_size);
- if(!buf)goto exit;
+ if(!buf)
+ goto exit;
- while( pos < data->data_size)
- {
- if( pos % vol->cluster_size == 0)
- {
- readed = ntfs_attr_pread(vol->lcnbmp_na, pos,
min(data->data_size - pos, vol->cluster_size), buf);
- if(readed < B_NO_ERROR) goto error;
+ while( pos < data->data_size) {
+ if( pos % vol->cluster_size == 0) {
+ readed = ntfs_attr_pread(vol->lcnbmp_na, pos,
+ min(data->data_size - pos, vol->cluster_size),
buf);
+ if(readed < B_NO_ERROR)
+ goto error;
if(readed != min(data->data_size - pos,
vol->cluster_size))
goto error;
}
-
- free_clusters += ntfs_count_bits( buf[pos%vol->cluster_size],
min( (vol->nr_clusters) - (pos * 8), 8));
+
+ free_clusters += ntfs_count_bits( buf[pos%vol->cluster_size],
+ min( (vol->nr_clusters) - (pos * 8), 8));
pos++;
}
error:
- if(buf)
- free(buf);
+ free(buf);
exit:
ns->free_clusters = free_clusters;
ns->state &= ~(NF_FreeClustersOutdate);
Other related posts:
