X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=2c0105bb97b248fd4a24a3dd5f946fa2dea17573;hp=3702ee7e995fa15af359f0a457c6dde174c5a7c3;hb=0a5a590bc1e8619efd1a0345adaf56a69027b44b;hpb=fced769402ff6ef0bf75fe9e4dcb2880891469e0

diff --git a/src/verify.c b/src/verify.c
index 3702ee7e..2c0105bb 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,7 +1,7 @@
 /*
  * verify.c
  *
- * Verify WIM inodes and stream reference counts.
+ * Verify stream reference counts.
  */
 
 /*
@@ -33,81 +33,10 @@
 #include "wimlib/metadata.h"
 #include "wimlib/security.h"
 
-/*
- * Verify a WIM inode:
- *
- * - Check to make sure the security ID is valid
- * - Check to make sure there is at most one unnamed stream
- * - Check to make sure there is at most one DOS name.
- */
-int
-verify_inode(struct wim_inode *inode, const struct wim_security_data *sd)
-{
-	struct wim_dentry *dentry;
-
-	/* Check the security ID.  -1 is valid and means "no security
-	 * descriptor".  Anything else has to be a valid index into the WIM
-	 * image's security descriptors table. */
-	if (inode->i_security_id < -1 ||
-	    (inode->i_security_id >= 0 &&
-	     inode->i_security_id >= sd->num_entries))
-	{
-		WARNING("\"%"TS"\" has an invalid security ID (%d)",
-			inode_first_full_path(inode), inode->i_security_id);
-		inode->i_security_id = -1;
-	}
-
-	/* Make sure there is only one unnamed data stream. */
-	unsigned num_unnamed_streams = 0;
-	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
-		const u8 *hash;
-		hash = inode_stream_hash(inode, i);
-		if (inode_stream_name_nbytes(inode, i) == 0 && !is_zero_hash(hash))
-			num_unnamed_streams++;
-	}
-	if (num_unnamed_streams > 1) {
-		WARNING("\"%"TS"\" has multiple (%u) un-named streams",
-			inode_first_full_path(inode), num_unnamed_streams);
-	}
-
-	/* Files cannot have multiple DOS names, even if they have multiple
-	 * names in multiple directories (i.e. hard links).
-	 * Source: NTFS-3g authors. */
-	struct wim_dentry *dentry_with_dos_name = NULL;
-	inode_for_each_dentry(dentry, inode) {
-		if (dentry_has_short_name(dentry)) {
-			if (dentry_with_dos_name) {
-				/* This was previously an error, but if we
-				 * capture a WIM from UDF on Windows, hard links
-				 * are supported but DOS names are automatically
-				 * generated for all names for an inode.  */
-			#if 0
-				ERROR("Hard-linked file has a DOS name at "
-				      "both `%"TS"' and `%"TS"'",
-				      dentry_full_path(dentry_with_dos_name),
-				      dentry_full_path(dentry));
-				return WIMLIB_ERR_INVALID_DENTRY;
-			#else
-				dentry->dos_name_invalid = 1;
-			#endif
-			}
-			dentry_with_dos_name = dentry;
-		}
-	}
-	return 0;
-}
-
 static int
 lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
 {
 	if (lte->refcnt != lte->real_refcnt) {
-		if (wimlib_print_errors) {
-			WARNING("The following lookup table entry has a reference "
-				"count of %u, but", lte->refcnt);
-			WARNING("We found %u references to it",
-				lte->real_refcnt);
-			print_lookup_table_entry(lte, stderr);
-		}
 		lte->refcnt = lte->real_refcnt;
 		++*(unsigned long *)ctr;
 	}
@@ -148,21 +77,23 @@ tally_image_refcnts(WIMStruct *wim)
  * problem by looking at ALL the images to re-calculate the reference count of
  * EVERY lookup table entry.  This only absolutely has to be done before an image
  * is deleted or before an image is mounted read-write. */
-void
+int
 wim_recalculate_refcnts(WIMStruct *wim)
 {
 	unsigned long num_ltes_with_bogus_refcnt = 0;
+	int ret;
 
 	for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL);
-	for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts);
+	ret = for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts);
+	if (ret)
+		return ret;
 	num_ltes_with_bogus_refcnt = 0;
 	for_lookup_table_entry(wim->lookup_table, lte_fix_refcnt,
 			       &num_ltes_with_bogus_refcnt);
 	if (num_ltes_with_bogus_refcnt != 0) {
-		WARNING("A total of %lu entries in the WIM's stream "
-			"lookup table had to have\n"
-			"          their reference counts fixed.",
+		WARNING("%lu stream(s) had incorrect reference count.",
 			num_ltes_with_bogus_refcnt);
 	}
 	wim->refcnts_ok = 1;
+	return 0;
 }