Misc structural changes.

lib/Makefile.in

@@ -23,12 +23,11 @@ VPATH = @srcdir@
 SOURCES=\
 	config/config.c \
 	dev-mgr/dev-manager.c \
-	dev-mgr/hash.c \
 	device/device.c \
 	display/display.c \
 	display/metadata.c \
+	filters/filter.c \
 	log/log.c \
-	metadata/lvm_v1.c \
 	metadata/metadata.c \
 	mm/pool.c \
 	mm/dbg_malloc.c 

lib/dev-mgr/dev-cache.h

@@ -1,6 +1,4 @@
 /*
- * tools/lib/dev-manager.h
- *
  * Copyright (C) 2001 Sistina Software
  *
  * This file is released under the GPL.
@@ -19,7 +17,7 @@ struct device {
 };
 
 struct dev_filter {
-	int (*fn)(struct device *dev, struct dev_cache_filter *f);
+	int (*passes_filter)(struct dev_cache_filter *f, struct device *dev);
 	void *private;
 };
 

lib/metadata/metadata.c

@@ -19,14 +19,10 @@
 
 #include <string.h>
 #include "dbg_malloc.h"
-#include "dev-manager.h"
+#include "dev-cache.h"
 #include "log.h"
 #include "metadata.h"
 
-/* FIXME: Use registered fn ptrs to avoid including this? */
-/*        Split into external/internal hdr files? */
-#include "lvm_v1.h"
-
 pv_t *pv_read(struct dev_mgr *dm, const char *pv_name)
 {
 	/* FIXME: Use config to select lvm_v1 format?  Cache results? */