cluster: STABLE3 - rgmanager: Fix fo_domain.c build warnings (part 2)

[Lon Hohberger <lon@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7f62bfdf449883094ec474f1ae1e7c67f4c4b668
Commit:        7f62bfdf449883094ec474f1ae1e7c67f4c4b668
Parent:        5877ba9d084f31e7de9894627e54debb7425f877
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Mon Jun 15 16:53:54 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 09:32:02 2009 -0400

rgmanager: Fix fo_domain.c build warnings (part 2)

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/include/resgroup.h      |   33 ---------------------------------
 rgmanager/include/reslist.h       |   26 --------------------------
 rgmanager/src/daemons/fo_domain.c |    1 +
 3 files changed, 1 insertions(+), 59 deletions(-)

diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h
index 84442fd..1adcdc8 100644
--- a/rgmanager/include/resgroup.h
+++ b/rgmanager/include/resgroup.h
@@ -225,22 +225,6 @@ int rg_unlock(struct dlm_lksb *p);
 
 const char *rg_strerror(int val);
 
-
-/*
- * Fail-over domain states
- */
-#define FOD_ILLEGAL		0
-#define FOD_GOOD		1
-#define FOD_BETTER		2
-#define FOD_BEST		3
-
-/* 
-   Fail-over domain flags
- */
-#define FOD_ORDERED		(1<<0)
-#define FOD_RESTRICTED		(1<<1)
-#define FOD_NOFAILBACK		(1<<2)
-
 /*
    Status tree flags
  */
@@ -257,23 +241,6 @@ const char *rg_strerror(int val);
 	fflush(stdout);\
 }
 
-#if 0
-#define pthread_mutex_lock(mutex) \
-{\
-	printf("lock(%s) @ %s:%d\n", #mutex, __FUNCTION__, __LINE__);\
-	fflush(stdout);\
-	pthread_mutex_lock(mutex);\
-}
-
-
-#define pthread_mutex_unlock(mutex) \
-{\
-	printf("unlock(%s) @ %s:%d\n", #mutex, __FUNCTION__, __LINE__);\
-	fflush(stdout);\
-	pthread_mutex_unlock(mutex);\
-}
-#endif
-
 #else /* DEBUG */
 
 #define dbg_printf(fmt, args...)
diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h
index 1052f94..564f93d 100644
--- a/rgmanager/include/reslist.h
+++ b/rgmanager/include/reslist.h
@@ -118,21 +118,6 @@ typedef struct _rg_node {
 	int	rn_pad;
 } resource_node_t;
 
-typedef struct _fod_node {
-	list_head();
-	char	*fdn_name;
-	int	fdn_prio;
-	int	fdn_nodeid;
-} fod_node_t;
-
-typedef struct _fod {
-	list_head();
-	char	*fd_name;
-	fod_node_t	*fd_nodes;
-	int	fd_flags;
-	int	_pad_; /* align */
-} fod_t;
-
 
 /*
    Exported Functions
@@ -178,17 +163,6 @@ int build_resource_tree(int ccsfd, resource_node_t **tree,
 void print_resource_tree(resource_node_t **tree);
 void destroy_resource_tree(resource_node_t **tree);
 
-/*
-   Construct/deconstruct failover domains
- */
-int construct_domains(int ccsfd, fod_t **domains);
-void deconstruct_domains(fod_t **domains);
-void print_domains(fod_t **domains);
-int node_should_start(int nodeid, cluster_member_list_t *membership,
-		      char *rg_name, fod_t **domains);
-int node_domain_set(fod_t **domains, char *name, int **ret, int *retlen, int *flags);
-int node_domain_set_safe(char *domainname, int **ret, int *retlen, int *flags);
-
 
 /*
    Handy functions
diff --git a/rgmanager/src/daemons/fo_domain.c b/rgmanager/src/daemons/fo_domain.c
index 54c082c..666d187 100644
--- a/rgmanager/src/daemons/fo_domain.c
+++ b/rgmanager/src/daemons/fo_domain.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <members.h>
 #include <sets.h>
+#include <fo_domain.h>
 
 
 //#define DEBUG