[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs attrib.c,1.63,1.64 dir.c,1.9,1.10 inode.c,1.17,1.18 volume.c,1.56,1.57

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

Changes by: flatcap

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

Modified Files:
	attrib.c dir.c inode.c volume.c 
Log Message:
AT_NONAME -> AT_UNNAMED


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -U2 -r1.63 -r1.64
--- attrib.c	14 Jul 2002 17:24:58 -0000	1.63
+++ attrib.c	15 Jul 2002 16:41:48 -0000	1.64
@@ -39,5 +39,5 @@
 #include "runlist.h"
 
-uchar_t AT_NONAME[] = { const_cpu_to_le16('\0') };
+uchar_t AT_UNNAMED[] = { const_cpu_to_le16('\0') };
 
 /**
@@ -248,5 +248,5 @@
 		na->name_len = name_len;
 	} else {
-		na->name     = AT_NONAME;
+		na->name     = AT_UNNAMED;
 		na->name_len = 0;
 	}
@@ -383,5 +383,5 @@
 	if (NAttrNonResident(na) && na->rl)
 		free(na->rl);
-	if (na->name != AT_NONAME)
+	if (na->name != AT_UNNAMED)
 		free(na->name);
 	free(na);
@@ -1191,6 +1191,6 @@
  * to interoperate cleanly with ntfs_find_external_attr().
  *
- * If @name is AT_NONAME search for an unnamed attribute. If @name is present
- * but not AT_NONAME search for a named attribute matching @name. Otherwise,
+ * If @name is AT_UNNAMED search for an unnamed attribute. If @name is present
+ * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
  * match both named and unnamed attributes.
  *
@@ -1272,9 +1272,9 @@
 			continue;
 		/*
-		 * If @name is AT_NONAME we want an unnamed attribute.
+		 * If @name is AT_UNNAMED we want an unnamed attribute.
 		 * If @name is present, compare the two names.
 		 * Otherwise, match any attribute.
 		 */
-		if (name == AT_NONAME) {
+		if (name == AT_UNNAMED) {
 			/* The search failed if the found attribute is named. */
 			if (a->name_length) {
@@ -1386,6 +1386,6 @@
  * safer to return error instead of success in this case.
  *
- * If @name is AT_NONAME search for an unnamed attribute. If @name is present
- * but not AT_NONAME search for a named attribute matching @name. Otherwise,
+ * If @name is AT_UNNAMED search for an unnamed attribute. If @name is present
+ * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
  * match both named and unnamed attributes.
  *
@@ -1491,9 +1491,9 @@
 			goto is_enumeration;
 		/*
-		 * If @name is AT_NONAME we want an unnamed attribute.
+		 * If @name is AT_UNNAMED we want an unnamed attribute.
 		 * If @name is present, compare the two names.
 		 * Otherwise, match any attribute.
 		 */
-		if (name == AT_NONAME) {
+		if (name == AT_UNNAMED) {
 			if (al_name_len)
 				goto not_found;
@@ -1707,6 +1707,6 @@
  * because it allows for simpler code inside ntfs_find_external_attr().
  *
- * If @name is AT_NONAME search for an unnamed attribute. If @name is present
- * but not AT_NONAME search for a named attribute matching @name. Otherwise,
+ * If @name is AT_UNNAMED search for an unnamed attribute. If @name is present
+ * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
  * match both named and unnamed attributes.
  *

Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- dir.c	12 Jul 2002 08:18:15 -0000	1.9
+++ dir.c	15 Jul 2002 16:41:48 -0000	1.10
@@ -549,5 +549,5 @@
 	if (!ctx)
 		return -1;
-	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)) {
 		Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
 				(unsigned long long)ni->mft_no);

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/inode.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- inode.c	12 Jul 2002 08:18:15 -0000	1.17
+++ inode.c	15 Jul 2002 16:41:48 -0000	1.18
@@ -125,5 +125,5 @@
 	if (!ctx)
 		goto err_out;
-	if (ntfs_lookup_attr(AT_ATTRIBUTE_LIST, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_ATTRIBUTE_LIST, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		if (errno != ENOENT)
 			goto put_err_out;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -U2 -r1.56 -r1.57
--- volume.c	14 Jul 2002 17:21:32 -0000	1.56
+++ volume.c	15 Jul 2002 16:41:48 -0000	1.57
@@ -145,5 +145,5 @@
 	}
 	/* Find the $ATTRIBUTE_LIST attribute in $MFT if present. */
-	if (ntfs_lookup_attr(AT_ATTRIBUTE_LIST, AT_NONAME, 0, 0, 0, NULL, 0, ctx)) {
+	if (ntfs_lookup_attr(AT_ATTRIBUTE_LIST, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		if (errno != ENOENT) {
 			Dputs("Error: $MFT has corrupt attribute list.");
@@ -190,5 +190,5 @@
 
 	/* Get an ntfs attribute for $MFT/$DATA and set it up, too. */
-	vol->mft_na = ntfs_attr_open(vol->mft_ni, AT_DATA, AT_NONAME, 0);
+	vol->mft_na = ntfs_attr_open(vol->mft_ni, AT_DATA, AT_UNNAMED, 0);
 	if (!vol->mft_na) {
 		Dperror("Failed to open ntfs attribute");
@@ -203,5 +203,5 @@
 	highest_vcn = next_vcn = 0;
 	a = NULL;
-	while (!ntfs_lookup_attr(AT_DATA, AT_NONAME, 0, 0, next_vcn, NULL, 0, ctx)) {
+	while (!ntfs_lookup_attr(AT_DATA, AT_UNNAMED, 0, 0, next_vcn, NULL, 0, ctx)) {
 		run_list_element *nrl;
 
@@ -269,5 +269,5 @@
 	 * The volume is now setup so we can use all read access functions.
 	 */
-	vol->mftbmp_na = ntfs_attr_open(vol->mft_ni, AT_BITMAP, AT_NONAME, 0);
+	vol->mftbmp_na = ntfs_attr_open(vol->mft_ni, AT_BITMAP, AT_UNNAMED, 0);
 	if (!vol->mftbmp_na) {
 		Dperror("Failed to open $MFT/$BITMAP");
@@ -317,5 +317,5 @@
 	}
 	/* Get an ntfs attribute for $MFTMirr/$DATA, too. */
-	vol->mftmirr_na = ntfs_attr_open(vol->mftmirr_ni, AT_DATA, AT_NONAME, 0);
+	vol->mftmirr_na = ntfs_attr_open(vol->mftmirr_ni, AT_DATA, AT_UNNAMED, 0);
 	if (!vol->mftmirr_na) {
 		Dperror("Failed to open $MFTMirr/$DATA");
@@ -599,5 +599,5 @@
 	}
 	/* Get an ntfs attribute for $Bitmap/$DATA. */
-	vol->lcnbmp_na = ntfs_attr_open(vol->lcnbmp_ni, AT_DATA, AT_NONAME, 0);
+	vol->lcnbmp_na = ntfs_attr_open(vol->lcnbmp_ni, AT_DATA, AT_UNNAMED, 0);
 	if (!vol->lcnbmp_na) {
 		Dputs(FAILED);
@@ -617,5 +617,5 @@
 	}
 	/* Get an ntfs attribute for $UpCase/$DATA. */
-	na = ntfs_attr_open(ni, AT_DATA, AT_NONAME, 0);
+	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
 	if (!na) {
 		Dputs(FAILED);
@@ -676,5 +676,5 @@
 	}
 	/* Find the $VOLUME_INFORMATION attribute. */
-	if (ntfs_lookup_attr(AT_VOLUME_INFORMATION, AT_NONAME, 0, 0, 0, NULL, 0,
+	if (ntfs_lookup_attr(AT_VOLUME_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0,
 			ctx)) {
 		Dputs(FAILED);
@@ -713,5 +713,5 @@
 	/* Find the $VOLUME_NAME attribute. */
 	ntfs_reinit_attr_search_ctx(ctx);
-	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)) {
 		Dputs(FAILED);
 		Dputs("$VOLUME_NAME attribute not found in $Volume?!?");
@@ -950,5 +950,5 @@
 	}
 
-	if ((na = ntfs_attr_open(ni, AT_DATA, AT_NONAME, 0)) == NULL) {
+	if ((na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0)) == NULL) {
 		Dperror("Failed to open $FILE_LogFile/$DATA\n");
 		goto error_exit;
@@ -1058,5 +1058,5 @@
 		goto err_exit;
 	}
-	if (ntfs_lookup_attr(AT_VOLUME_INFORMATION, AT_NONAME, 0, 0, 0, NULL, 0,
+	if (ntfs_lookup_attr(AT_VOLUME_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0,
 			ctx)) {
 		Dputs("Error: Attribute $VOLUME_INFORMATION was not found in "