From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30107 invoked by alias); 22 Jun 2009 16:55:33 -0000 Received: (qmail 30079 invoked by alias); 22 Jun 2009 16:55:32 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_45,J_CHICKENPOX_54,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_45,J_CHICKENPOX_54,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: rgmanager: master - rgmanager: Fix last bits of compiler warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 28a9de785161d40c70e81e1dea16bc4877dacb3a X-Git-Newrev: d01fecb3d36e4539d6bef1d068c182fcfc113ff6 From: Lon Hohberger Message-Id: <20090622165439.9A9D21201D4@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 16:55:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00648.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=d01fecb3d36e4539d6bef1d068c182fcfc113ff6 Commit: d01fecb3d36e4539d6bef1d068c182fcfc113ff6 Parent: 28a9de785161d40c70e81e1dea16bc4877dacb3a Author: Lon Hohberger AuthorDate: Tue Jun 16 16:53:35 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 12:52:06 2009 -0400 rgmanager: Fix last bits of compiler warnings Signed-off-by: Lon Hohberger --- rgmanager/include/event.h | 1 + rgmanager/include/reslist.h | 6 +----- rgmanager/include/rg_locks.h | 4 ++++ rgmanager/src/daemons/event_config.c | 19 +------------------ rgmanager/src/daemons/main.c | 4 ++-- rgmanager/src/daemons/reslist.c | 2 +- rgmanager/src/daemons/restree.c | 1 + rgmanager/src/daemons/rg_locks.c | 11 +++++++---- rgmanager/src/daemons/service_op.c | 9 ++------- rgmanager/src/daemons/slang_event.c | 2 +- rgmanager/src/daemons/test.c | 32 +++++++++++++++++++------------- rgmanager/src/daemons/watchdog.c | 5 +++++ 12 files changed, 45 insertions(+), 51 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index aaa1900..84d384b 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -133,5 +133,6 @@ int32_t master_event_callback(char *key, uint64_t viewno, void *data, int node_has_fencing(int nodeid); int fence_domain_joined(void); +int get_service_state_internal(const char *svcName, rg_state_t *svcStatus); #endif diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 19fd023..20f205d 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -163,6 +163,7 @@ 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); +void *act_dup(resource_act_t *acts); /* Handy functions @@ -192,9 +193,4 @@ const char *res_attr_value(resource_t *res, const char *attrname); const char *primary_attr_value(resource_t *); int rescmp(resource_t *l, resource_t *r); -#ifdef NO_CCS -int conf_get(char *query, char **ret); -int conf_setconfig(char *path); -#endif - #endif /* _RESLIST_H */ diff --git a/rgmanager/include/rg_locks.h b/rgmanager/include/rg_locks.h index 6fbd887..a64d58f 100644 --- a/rgmanager/include/rg_locks.h +++ b/rgmanager/include/rg_locks.h @@ -39,5 +39,9 @@ int rg_set_childmax(int max); int ccs_lock(void); int ccs_unlock(int fd); +#ifdef NO_CCS +int conf_get(const char *query, char **ret); +void conf_setconfig(const char *path); #endif +#endif diff --git a/rgmanager/src/daemons/event_config.c b/rgmanager/src/daemons/event_config.c index a8212e4..3523a6d 100644 --- a/rgmanager/src/daemons/event_config.c +++ b/rgmanager/src/daemons/event_config.c @@ -128,24 +128,7 @@ event_match(event_t *pattern, event_t *actual) } -char * -#ifndef NO_CCS -ccs_node_id_to_name(int ccsfd, int nodeid) -#else -ccs_node_id_to_name(int __attribute__ ((unused)) ccsfd, int nodeid) -#endif -{ - char xpath[256], *ret = 0; - - snprintf(xpath, sizeof(xpath), CONFIG_NODE_ID_TO_NAME, - nodeid); - if (ccs_get(ccsfd, xpath, &ret) == 0) - return ret; - return NULL; -} - - -int +static int #ifndef NO_CCS ccs_node_name_to_id(int ccsfd, char *name) #else diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 5dd5071..4082743 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -29,7 +29,7 @@ void dump_thread_states(FILE *); static int configure_rgmanager(int ccsfd, int debug); void set_transition_throttling(int); -static void flag_shutdown(int sig); +void flag_shutdown(int sig); int watchdog_init(void); @@ -714,7 +714,7 @@ event_loop(msgctx_t *localctx, msgctx_t *clusterctx) } -static void +void flag_shutdown(int __attribute__ ((unused)) sig) { shutdown_pending = 1; diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c index d3ce483..96336e4 100644 --- a/rgmanager/src/daemons/reslist.c +++ b/rgmanager/src/daemons/reslist.c @@ -602,7 +602,7 @@ print_resource(resource_t *res) } -static void * +void * act_dup(resource_act_t *acts) { int x; diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index bdb4b05..5afbc5c 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -48,6 +48,7 @@ const char *ocf_errors[] = { /* XXX MEGA HACK */ #ifdef NO_CCS static int _no_op_mode_ = 0; +void _no_op_mode(int arg); void _no_op_mode(int arg) { diff --git a/rgmanager/src/daemons/rg_locks.c b/rgmanager/src/daemons/rg_locks.c index d6c7886..f2d1050 100644 --- a/rgmanager/src/daemons/rg_locks.c +++ b/rgmanager/src/daemons/rg_locks.c @@ -7,7 +7,10 @@ #include #include #include -char*xpath_get_one(xmlDocPtr, xmlXPathContextPtr, char *); +#include +#include +#include +#include #else #include #endif @@ -37,7 +40,7 @@ static pthread_mutex_t _ccs_mutex = PTHREAD_MUTEX_INITIALIZER; #ifdef NO_CCS static xmlDocPtr ccs_doc = NULL; -static char *conffile = DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE; +static const char *conffile = DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE; #endif int @@ -146,7 +149,7 @@ ccs_unlock(int __attribute__((unused)) fd) void -conf_setconfig(char *path) +conf_setconfig(const char *path) { pthread_mutex_lock(&_ccs_mutex); conffile = path; @@ -155,7 +158,7 @@ conf_setconfig(char *path) int -conf_get(char *path, char **value) +conf_get(const char *path, char **value) { char *foo; xmlXPathContextPtr ctx; diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index 11121d5..aa36f41 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -19,14 +19,9 @@ #include -/* - * Send a message to the target node to start the service. - */ -int get_service_state_internal(char *svcName, rg_state_t *svcStatus); - - /** - * + * Send a message to the target node list, one at a time, to start + * the service. Of course, the target list can be just 1 node. */ int service_op_start(char *svcName, diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 8759f82..1a2b3ac 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -164,7 +164,7 @@ do { \ } while(0) -static int +int get_service_state_internal(const char *svcName, rg_state_t *svcStatus) { struct dlm_lksb lock; diff --git a/rgmanager/src/daemons/test.c b/rgmanager/src/daemons/test.c index f981424..3c487c9 100644 --- a/rgmanager/src/daemons/test.c +++ b/rgmanager/src/daemons/test.c @@ -3,15 +3,18 @@ #include #include #include -#include -#include -#include +#include #include #include #include +#include +#include +#include #include #include #include +#include +#include #ifndef NO_CCS #error "Can not be built with CCS support." @@ -21,10 +24,12 @@ void res_build_name(char *, size_t, resource_t *); /** - Tells us if a resource group can be migrated. + Tells us if a resource group can be migrated w/o the group.c definition + XXX replace! */ -int -group_migratory(resource_t **resources, resource_node_t **tree, char *groupname) +static int +test_group_migratory(resource_t **resources, resource_node_t **tree, + char *groupname) { resource_node_t *rn; resource_t *res; @@ -81,10 +86,10 @@ out_unlock: void _no_op_mode(int); -char *agentpath = RESOURCE_ROOTDIR; +char *agentpath = (char *)RESOURCE_ROOTDIR; -int +static int rules_func(int __attribute__((unused)) argc, char __attribute__((unused)) **argv) { @@ -109,7 +114,7 @@ rules_func(int __attribute__((unused)) argc, } -int +static int test_func(int argc, char **argv) { fod_t *domains = NULL; @@ -250,7 +255,7 @@ out: } -int +static int tree_delta_test(int argc, char **argv) { resource_rule_t *rulelist = NULL, *currule, *rulelist2 = NULL; @@ -329,7 +334,8 @@ tree_delta_test(int argc, char **argv) } if (!tn->rn_child && ((tn->rn_resource->r_rule->rr_flags & - RF_DESTROY) == 0) && group_migratory(&reslist, &tree, rg) && + RF_DESTROY) == 0) && test_group_migratory(&reslist, &tree, + rg) && need_kill == 1) { /* Do something smart here: flip state? */ printf("[no-op] %s was removed from the config, but I am not stopping it.\n", @@ -353,7 +359,7 @@ tree_delta_test(int argc, char **argv) } if (!tn->rn_child && ((tn->rn_resource->r_rule->rr_flags & - RF_INIT) == 0) && group_migratory(&reslist2, &tree2, rg) && + RF_INIT) == 0) && test_group_migratory(&reslist2, &tree2, rg) && need_init == 1) { /* Do something smart here? */ printf("[noop] %s was added, but I am not initializing it\n", rg); @@ -380,7 +386,7 @@ out: } -int +static int usage(char *arg0) { printf("usage: %s [agent_path] \n\n", arg0); diff --git a/rgmanager/src/daemons/watchdog.c b/rgmanager/src/daemons/watchdog.c index 3846104..6efd655 100644 --- a/rgmanager/src/daemons/watchdog.c +++ b/rgmanager/src/daemons/watchdog.c @@ -8,6 +8,8 @@ #include #include +int watchdog_init(void); + static pid_t child = 0; static void @@ -15,6 +17,8 @@ signal_handler(int signum) { kill(child, signum); } + + static void redirect_signals(void) { @@ -34,6 +38,7 @@ redirect_signals(void) } } + /** return watchdog's pid, or 0 on failure */