From 7f1e8db796ac41dbeb8359be6e1fc69a85327597 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 24 Nov 2004 20:36:52 +0000
Subject: [PATCH] Improve filter debug msgs.

---
 WHATS_NEW                       | 1 +
 lib/filters/filter-persistent.c | 9 +++------
 lib/filters/filter-regex.c      | 3 +++
 lib/filters/filter-sysfs.c      | 6 +++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 49aaf790a..b87d36746 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.00.27 -
 ====================================
+  Improve filter debug mesgs.
 
 Version 2.00.26 - 23rd November 2004
 ====================================
diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c
index 1b9f7851e..7b94b95ce 100644
--- a/lib/filters/filter-persistent.c
+++ b/lib/filters/filter-persistent.c
@@ -212,13 +212,10 @@ static int _lookup_p(struct dev_filter *f, struct device *dev)
 			sl = list_item(ah, struct str_list);
 			hash_insert(pf->devices, sl->str, l);
 		}
-	}
+	} else if (l == PF_BAD_DEVICE)
+			log_debug("%s: Skipping (cached)", dev_name(dev));
 
-	if (l == PF_BAD_DEVICE) {
-		log_debug("%s: Skipping (cached)", dev_name(dev));
-		return 0;
-	} else
-		return 1;
+	return (l == PF_BAD_DEVICE) ? 0 : 1;
 }
 
 static void _destroy(struct dev_filter *f)
diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c
index ed76b3a85..ed6da849d 100644
--- a/lib/filters/filter-regex.c
+++ b/lib/filters/filter-regex.c
@@ -186,6 +186,9 @@ static int _accept_p(struct dev_filter *f, struct device *dev)
 		first = 0;
 	}
 
+	if (rejected)
+		log_debug("%s: Skipping (regex)", dev_name(dev));
+
 	/*
 	 * pass everything that doesn't match
 	 * anything.
diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c
index 81e8a25ec..8ac08d37e 100644
--- a/lib/filters/filter-sysfs.c
+++ b/lib/filters/filter-sysfs.c
@@ -246,7 +246,11 @@ static int _accept_p(struct dev_filter *f, struct device *dev)
 	if (ds->initialised != 1)
 		return 1;
 
-	return _set_lookup(ds, dev->dev);
+	if (!_set_lookup(ds, dev->dev)) {
+		log_debug("%s: Skipping (sysfs)", dev_name(dev));
+		return 0;
+	} else
+		return 1;
 }
 
 static void _destroy(struct dev_filter *f)