more fixes

daemons/clvmd/clvmd-command.c

@@ -67,7 +67,6 @@
 #include <libdevmapper.h>
 #include <libdlm.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "lvm-functions.h"

daemons/clvmd/clvmd-gulm.c

@@ -44,7 +44,6 @@
 #include <ccs.h>
 #include <libgulm.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "clvm.h"

daemons/clvmd/clvmd-openais.c

@@ -39,7 +39,6 @@
 #include <openais/saLck.h>
 #include <openais/cpg.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "clvm.h"

daemons/clvmd/clvmd.c

@@ -46,7 +46,6 @@
 #include "version.h"
 #include "clvmd.h"
 #include "refresh_clvmd.h"
-#include "list.h"
 #include "log.h"
 
 #ifndef TRUE

daemons/clvmd/lvm-functions.c

@@ -33,7 +33,6 @@
 #include <libdevmapper.h>
 #include <libdlm.h>
 
-#include "list.h"
 #include "lvm-types.h"
 #include "clvm.h"
 #include "clvmd-comms.h"

daemons/dmeventd/dmeventd.c

@@ -22,7 +22,6 @@
 #include "configure.h"
 #include "libdevmapper.h"
 #include "libdevmapper-event.h"
-#include "list.h"
 #include "dmeventd.h"
 //#include "libmultilog.h"
 #include "dm-logging.h"

lib/format_pool/disk_rep.c

@@ -19,9 +19,10 @@
 #include "lvmcache.h"
 #include "filter.h"
 #include "xlate.h"
-
 #include "disk_rep.h"
 
+#include <assert.h>
+
 /* FIXME: memcpy might not be portable */
 #define CPIN_8(x, y, z) {memcpy((x), (y), (z));}
 #define CPOUT_8(x, y, z) {memcpy((y), (x), (z));}

lib/locking/cluster_locking.c

@@ -25,6 +25,7 @@
 #include "locking.h"
 #include "locking_types.h"
 
+#include <assert.h>
 #include <stddef.h>
 #include <sys/socket.h>
 #include <sys/un.h>

lib/locking/locking.c

@@ -23,6 +23,7 @@
 #include "defaults.h"
 #include "lvmcache.h"
 
+#include <assert.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <limits.h>

lib/metadata/pv_map.c

@@ -17,6 +17,8 @@
 #include "pv_map.h"
 #include "pv_alloc.h"
 
+#include <assert.h>
+
 /*
  * Areas are maintained in size order, largest first.
  *

lib/uuid/uuid.c

@@ -16,6 +16,7 @@
 #include "lib.h"
 #include "uuid.h"
 
+#include <assert.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

libdm/datastruct/list.c

@@ -14,6 +14,7 @@
  */
 
 #include "lib.h"
+#include <assert.h>
 
 /*
  * Initialise a list before use.

libdm/libdevmapper.h

@@ -799,7 +799,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e
  * The containing structure should be the same type as 'v'.
  * The list should be 'struct dm_list list' within the containing structure.
  */
-#define dm_list_iterate_back_items(v, head) list_iterate_back_items_gen(v, (head), list)
+#define dm_list_iterate_back_items(v, head) dm_list_iterate_back_items_gen(v, (head), list)
 
 /*
  * Return the number of elements in a list by walking it.

libdm/libdm-common.c

@@ -16,7 +16,6 @@
 #include "dmlib.h"
 #include "libdm-targets.h"
 #include "libdm-common.h"
-#include "list.h"
 #include "kdev_t.h"
 #include "dm-ioctl.h"
 

libdm/libdm-deptree.c

@@ -15,7 +15,6 @@
 #include "dmlib.h"
 #include "libdm-targets.h"
 #include "libdm-common.h"
-#include "list.h"
 #include "kdev_t.h"
 #include "dm-ioctl.h"