[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsrm.c,1.39,1.40

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10416

Modified Files:
	ntfsrm.c 
Log Message:
no code changes, merely reordered some functions

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ntfsrm.c	12 Jul 2005 17:13:29 -0000	1.39
+++ ntfsrm.c	12 Jul 2005 17:58:47 -0000	1.40
@@ -44,10 +44,6 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet
 
 //#define RM_WRITE 1
 
-static int ntfs_inode_close2 (ntfs_inode *ni);
-static int ntfs_dt_root_replace (struct ntfs_dt *del, int del_num, INDEX_ENTRY *del_ie, INDEX_ENTRY *suc_ie);
-static int ntfs_dir_truncate (ntfs_volume *vol, struct ntfs_dir *dir);
-
 /**
  * version - Print version information about the program
  *
@@ -286,6 +282,108 @@ static const char *ntfsinfo_time_to_str(
[...4745 lines suppressed...]
-	return 0;
+	found->dir      = dir;
+	found->dt       = dt;
+	found->dt_index = dt_num;
+	found->inode    = dt->inodes[dt_num];
+	found->mref     = found->inode->mft_no;
+	result = TRUE;
+	//printf ("dir %p, dt %p, num %d, ino %p, %lld\n", dir, dt, dt_num, dt->inodes[dt_num], MREF (found->inode->mft_no));
+close:
+	free (ascii);	// from strdup
+	free (unicode);
+	return result;
 }
 
 
@@ -5174,3 +5169,4 @@ done:
 
 	return result;
 }
+