[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.81,1.82 ntfsdump_logfile.c,1.27,1.28 ntfsinfo.c,1.14,1.15 ntfslabel.c,1.17,1.18 ntfsresize.c,1.14,1.15 ntfsundelete.c,1.12,1.13

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv14762/ntfstools

Modified Files:
	mkntfs.c ntfsdump_logfile.c ntfsinfo.c ntfslabel.c 
	ntfsresize.c ntfsundelete.c 
Log Message:
AT_NONAME -> AT_UNNAMED


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -U2 -r1.81 -r1.82
--- mkntfs.c	15 Jul 2002 15:09:21 -0000	1.81
+++ mkntfs.c	15 Jul 2002 16:41:48 -0000	1.82
@@ -1227,5 +1227,5 @@
 		}
 	} else
-		uname = AT_NONAME;
+		uname = AT_UNNAMED;
 	/* Check if the attribute is already there. */
 	ctx = ntfs_get_attr_search_ctx(NULL, m);
@@ -1379,5 +1379,5 @@
 	if (ctx)
 		ntfs_put_attr_search_ctx(ctx);
-	if (uname && (uname != AT_NONAME))
+	if (uname && (uname != AT_UNNAMED))
 		free(uname);
 	if (rl)
@@ -1408,5 +1408,5 @@
 			return -ENAMETOOLONG;
 	} else
-		uname = AT_NONAME;
+		uname = AT_UNNAMED;
 	/* Check if the attribute is already there. */
 	ctx = ntfs_get_attr_search_ctx(NULL, m);
@@ -1481,5 +1481,5 @@
 	if (ctx)
 		ntfs_put_attr_search_ctx(ctx);
-	if (uname && (uname != AT_NONAME))
+	if (uname && (uname != AT_UNNAMED))
 		free(uname);
 	return err;
@@ -1544,5 +1544,5 @@
 		return -ENOMEM;
 	}
-	if (ntfs_lookup_attr(AT_STANDARD_INFORMATION, AT_NONAME, 0, 0, 0, NULL, 0,
+	if (ntfs_lookup_attr(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0,
 			ctx)) {
 		int eo = errno;
@@ -3096,5 +3096,5 @@
 					"context: %s\n", strerror(errno));
 		/* There is exactly one file name so this is ok. */
-		if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0,
+		if (ntfs_lookup_attr(AT_FILE_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0,
 				ctx)) {
 			ntfs_put_attr_search_ctx(ctx);
@@ -3476,5 +3476,5 @@
 		err_exit("Failed to allocate attribute search context: %s\n",
 				strerror(errno));
-	if (ntfs_lookup_attr(AT_DATA, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_DATA, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		ntfs_put_attr_search_ctx(ctx);
 		err_exit("BUG: $DATA attribute not found.\n");

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- ntfsdump_logfile.c	11 Jul 2002 16:20:34 -0000	1.27
+++ ntfsdump_logfile.c	15 Jul 2002 16:41:48 -0000	1.28
@@ -136,5 +136,5 @@
 	}
 	/* Find the $DATA attribute of the $LogFile. */
-	if (ntfs_lookup_attr(AT_DATA, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_DATA, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		fprintf(stderr, "Error: Attribute $DATA was not found in" \
 		                "$LogFile!\n");

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsinfo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ntfsinfo.c	11 Jul 2002 23:44:14 -0000	1.14
+++ ntfsinfo.c	15 Jul 2002 16:41:48 -0000	1.15
@@ -126,5 +126,5 @@
 
 	if (ntfs_lookup_attr
-		(AT_STANDARD_INFORMATION, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+		(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		perror("Error looking up $STANDARD_INFORMATION!\n");
 		exit(1);
@@ -166,5 +166,5 @@
 	char *file_name;
 
-	if (ntfs_lookup_attr(AT_FILE_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_FILE_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		perror("Error looking up $FILE_NAME_ATTR!\n");
 		exit(1);

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfslabel.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- ntfslabel.c	11 Jul 2002 16:20:34 -0000	1.17
+++ ntfslabel.c	15 Jul 2002 16:41:48 -0000	1.18
@@ -162,5 +162,5 @@
 		goto err_out;
 	}
-	if (ntfs_lookup_attr(AT_VOLUME_NAME, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_VOLUME_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		perror("Lookup of $VOLUME_NAME attribute failed");
 		goto err_out;

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ntfsresize.c	14 Jul 2002 18:13:04 -0000	1.14
+++ ntfsresize.c	15 Jul 2002 16:41:48 -0000	1.15
@@ -237,5 +237,5 @@
                 perr_exit("ntfs_get_attr_search_ctx");
 
-	if (ntfs_lookup_attr(AT_DATA, AT_NONAME, 0, 0, 0, NULL, 0, ctx))
+	if (ntfs_lookup_attr(AT_DATA, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx))
 		perr_exit("ntfs_lookup_attr");
 
@@ -517,5 +517,5 @@
 
 	if (!ustr || !len) {
-		ustr = AT_NONAME;
+		ustr = AT_UNNAMED;
 		len = 0;
 	}
@@ -524,5 +524,5 @@
 		perr_exit("ntfs_lookup_attr");
 
-	if (ustr != AT_NONAME)
+	if (ustr != AT_UNNAMED)
 		free(ustr);
 }

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsundelete.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- ntfsundelete.c	15 Jul 2002 16:30:41 -0000	1.12
+++ ntfsundelete.c	15 Jul 2002 16:41:48 -0000	1.13
@@ -1291,5 +1291,5 @@
 		return -1;
 
-	attr = ntfs_attr_open (vol->mft_ni, AT_BITMAP, AT_NONAME, 0);
+	attr = ntfs_attr_open (vol->mft_ni, AT_BITMAP, AT_UNNAMED, 0);
 	if (!attr)
 		return -1;