From 6fa0e03a4d620952de4fdf0cbbab064190e97ce1 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Fri, 3 Sep 2004 19:46:23 +0000 Subject: [PATCH] * some more warning elimination This commit was SVN r2493. --- src/mca/pcm/base/pcm_base_comm.c | 2 -- src/mca/pcm/rsh/src/pcm_rsh_component.c | 6 ++++-- src/mca/pcmclient/singleton/pcmclient_singleton.c | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mca/pcm/base/pcm_base_comm.c b/src/mca/pcm/base/pcm_base_comm.c index ee1d5b284b..1b7c14ecb1 100644 --- a/src/mca/pcm/base/pcm_base_comm.c +++ b/src/mca/pcm/base/pcm_base_comm.c @@ -24,8 +24,6 @@ mca_pcm_base_send_schedule(FILE *fp, int num_procs) { int i, envc; - ompi_list_item_t *node_item; - mca_llm_base_hostfile_data_t *node; fprintf(fp, START_KEY); fprintf(fp, "%d\n", PROTOCOL_VERSION); diff --git a/src/mca/pcm/rsh/src/pcm_rsh_component.c b/src/mca/pcm/rsh/src/pcm_rsh_component.c index 5953979ca3..d3c77a629e 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh_component.c +++ b/src/mca/pcm/rsh/src/pcm_rsh_component.c @@ -168,9 +168,11 @@ mca_pcm_rsh_init(int *priority, /* copy over the function pointers */ mca_pcm_rsh_1_0_0.pcm_allocate_resources = - mca_pcm_rsh_llm.llm_allocate_resources; + (mca_pcm_base_allocate_resources_fn_t) + mca_pcm_rsh_llm.llm_allocate_resources; mca_pcm_rsh_1_0_0.pcm_deallocate_resources = - mca_pcm_rsh_llm.llm_deallocate_resources; + (mca_pcm_base_deallocate_resources_fn_t) + mca_pcm_rsh_llm.llm_deallocate_resources; /* DO SOME PARAM "FIXING" */ /* BWB - remove param fixing before 1.0 */ diff --git a/src/mca/pcmclient/singleton/pcmclient_singleton.c b/src/mca/pcmclient/singleton/pcmclient_singleton.c index bb8a7fa535..19c4bb66e8 100644 --- a/src/mca/pcmclient/singleton/pcmclient_singleton.c +++ b/src/mca/pcmclient/singleton/pcmclient_singleton.c @@ -61,7 +61,10 @@ mca_pcmclient_singleton_get_self(void) if (NULL == mca_pcmclient_singleton_procs) { ret = init_proclist(); - if (OMPI_SUCCESS != ret) return ret; + if (OMPI_SUCCESS != ret) { + errno = ret; + return NULL; + } } return &mca_pcmclient_singleton_procs[0];