Changes by: cha0smaster
Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32359/libntfs
Modified Files:
attrib.c bitmap.c dir.c lcnalloc.c
Log Message:
cleanup
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- attrib.c 9 Feb 2006 21:40:00 -0000 1.203
+++ attrib.c 10 Feb 2006 11:00:47 -0000 1.204
@@ -681,7 +681,7 @@ runlist_element *ntfs_attr_find_vcn(ntfs
errno = EINVAL;
return NULL;
}
-
+
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, vcn %llx\n",
(unsigned long long)na->ni->mft_no, na->type,
(long long)vcn);
@@ -1580,7 +1580,7 @@ static int ntfs_attr_find(const ATTR_TYP
ntfs_volume *vol;
ntfschar *upcase;
u32 upcase_len;
-
+
ntfs_log_trace("Entering.\n");
if (ctx->ntfs_ino) {
@@ -3909,7 +3909,7 @@ static int ntfs_attr_make_resident(ntfs_
ATTR_REC *a = ctx->attr;
int name_ofs, val_ofs, err = EIO;
s64 arec_size, bytes_read;
-
+
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
long)na->ni->mft_no, na->type);
@@ -4916,7 +4916,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co
errno = EINVAL;
return -1;
}
-
+
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
long)na->ni->mft_no, na->type);
Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bitmap.c 9 Feb 2006 21:40:00 -0000 1.21
+++ bitmap.c 10 Feb 2006 11:00:47 -0000 1.22
@@ -226,7 +226,7 @@ int ntfs_bitmap_clear_run(ntfs_attr *na,
{
ntfs_log_trace("Dealloc from bit 0x%llx, count 0x%llx.\n",
(long long)start_bit, (long long)count);
-
+
return ntfs_bitmap_set_bits_in_run(na, start_bit, count, 0);
}
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- dir.c 9 Feb 2006 21:43:52 -0000 1.53
+++ dir.c 10 Feb 2006 11:00:47 -0000 1.54
@@ -1110,7 +1110,6 @@ static ntfs_inode *__ntfs_create(ntfs_in
ntfschar *target, u8 target_len)
{
ntfs_inode *ni;
- ntfs_attr *na;
int rollback_data = 0;
FILE_NAME_ATTR *fn = NULL;
STANDARD_INFORMATION *si = NULL;
@@ -1186,7 +1185,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
ie->key_length = 0;
ie->flags = INDEX_ENTRY_END;
/* Add INDEX_ROOT attribute to inode. */
- if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4, (u8*)ir, ir_len)) {
+ if (ntfs_attr_add(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4,
+ (u8*)ir, ir_len)) {
err = errno;
free(ir);
ntfs_log_error("Failed to add INDEX_ROOT attribute.\n");
@@ -1296,6 +1296,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
err_out:
ntfs_log_trace("Failed.\n");
if (rollback_data) {
+ ntfs_attr *na;
+
na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
if (!na)
ntfs_log_perror("Failed to open data attribute of "
Index: lcnalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lcnalloc.c 9 Feb 2006 21:40:00 -0000 1.34
+++ lcnalloc.c 10 Feb 2006 11:00:47 -0000 1.35
@@ -763,7 +763,7 @@ int ntfs_cluster_free(ntfs_volume *vol,
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, count 0x%llx, "
"vcn 0x%llx.\n", (unsigned long long)na->ni->mft_no,
na->type, (long long)count, (long long)start_vcn);
-
+
rl = ntfs_attr_find_vcn(na, start_vcn);
if (!rl) {
if (errno == ENOENT)
|
