Commit a24de36a authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r3523] Stomped some more warnings reported by the Intel compiler.

parent 6d6a1bf8
......@@ -18,10 +18,6 @@ HYD_Status HYD_BSCI_Get_universe_size(int *size)
*size = -1;
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -22,10 +22,6 @@ HYD_Status HYD_BSCI_Wait_for_completion(void)
status = HYD_BSCU_Wait_for_completion();
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -7,4 +7,4 @@ HYDRA_LIB_PATH = ../../lib
libhydra_a_DIR = ${HYDRA_LIB_PATH}
libhydra_a_SOURCES = bscu_init.c bscu_finalize.c bscu_args.c bscu_wait.c bscu_launch.c bscu_signal.c
INCLUDES = -I${abs_srcdir}/../../utils -I${abs_srcdir}/../../include -I../../include -I${abs_srcdir}/../include -I${abs_srcdir}/../../bootstrap/include -I${abs_srcdir} -I${abs_srcdir}/../../control/include -I${abs_srcdir}/../../demux -I${abs_srcdir}/../../pm/include -I${abs_srcdir}/../../launch/mpiexec -I${abs_srcdir}/../../../../include -I../../../../include
INCLUDES = -I${abs_srcdir}/../../utils -I${abs_srcdir}/../../include -I../../include -I${abs_srcdir}/../include -I${abs_srcdir}/../../bootstrap/include -I${abs_srcdir} -I${abs_srcdir}/../../control/include -I${abs_srcdir}/../../control/utils -I${abs_srcdir}/../../demux -I${abs_srcdir}/../../pm/include -I${abs_srcdir}/../../launch/mpiexec -I${abs_srcdir}/../../../../include -I../../../../include
......@@ -76,12 +76,8 @@ HYD_Status HYD_BSCU_Append_exec(char **exec, char **client_arg)
client_arg[i++] = MPIU_Strdup(exec[j]);
client_arg[i++] = NULL;
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -98,10 +94,6 @@ HYD_Status HYD_BSCU_Append_wdir(char **client_arg)
client_arg[arg++] = MPIU_Strdup(";");
client_arg[arg++] = NULL;
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -29,12 +29,8 @@ HYD_Status HYD_BSCU_Finalize_exit_status(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -52,10 +48,6 @@ HYD_Status HYD_BSCU_Finalize_io_fds(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -82,10 +82,6 @@ void HYD_BSCU_Signal_handler(int signal)
/* Ignore other signals for now */
}
fn_exit:
HYDU_FUNC_EXIT();
return;
fn_fail:
goto fn_exit;
}
......@@ -8,6 +8,7 @@
#include "hydra_dbg.h"
#include "hydra_mem.h"
#include "csi.h"
#include "csiu.h"
#include "bsci.h"
#include "bscu.h"
......
......@@ -7,4 +7,4 @@ HYDRA_LIB_PATH = ../../lib
libhydra_a_DIR = ${HYDRA_LIB_PATH}
libhydra_a_SOURCES = consys_launch.c consys_wait.c consys_close.c consys_finalize.c
INCLUDES = -I${abs_srcdir}/../../utils -I${abs_srcdir}/../../include -I../../include -I${abs_srcdir}/../include -I${abs_srcdir}/../../bootstrap/include -I${abs_srcdir}/../../demux -I${abs_srcdir}/../../pm/include -I${abs_srcdir}/../../launch/mpiexec -I${abs_srcdir}/../../../../include -I../../../../include
INCLUDES = -I${abs_srcdir}/../utils -I${abs_srcdir}/../../utils -I${abs_srcdir}/../../include -I../../include -I${abs_srcdir}/../include -I${abs_srcdir}/../../bootstrap/include -I${abs_srcdir}/../../demux -I${abs_srcdir}/../../pm/include -I${abs_srcdir}/../../launch/mpiexec -I${abs_srcdir}/../../../../include -I../../../../include
......@@ -9,6 +9,7 @@
#include "csi.h"
#include "pmci.h"
#include "bsci.h"
#include "demux.h"
HYD_CSI_Handle csi_handle;
......
......@@ -10,6 +10,7 @@
#include "csi.h"
#include "pmci.h"
#include "bsci.h"
#include "demux.h"
HYD_Status HYD_CSI_Finalize(void)
{
......
......@@ -7,8 +7,10 @@
#include "hydra.h"
#include "hydra_dbg.h"
#include "csi.h"
#include "csiu.h"
#include "pmci.h"
#include "bsci.h"
#include "demux.h"
HYD_CSI_Handle csi_handle;
......
......@@ -31,7 +31,4 @@ int HYD_CSU_Time_left(void)
fn_exit:
HYDU_FUNC_EXIT();
return time_left;
fn_fail:
goto fn_exit;
}
......@@ -7,4 +7,4 @@ HYDRA_LIB_PATH = ../lib
libhydra_a_DIR = ${HYDRA_LIB_PATH}
libhydra_a_SOURCES = demux.c
INCLUDES = -I${abs_srcdir}/../demux -I${abs_srcdir}/../control/include/ -I${abs_srcdir}/../include -I../include -I${abs_srcdir}/../utils -I${abs_srcdir}/../../../include -I../../../include
INCLUDES = -I${abs_srcdir}/../demux -I${abs_srcdir}/../control/include/ -I${abs_srcdir}/../control/utils -I${abs_srcdir}/../include -I../include -I${abs_srcdir}/../utils -I${abs_srcdir}/../../../include -I../../../include
......@@ -8,6 +8,7 @@
#include "hydra_sock.h"
#include "hydra_dbg.h"
#include "hydra_mem.h"
#include "csiu.h"
#include "demux.h"
static int num_cb_fds = 0;
......@@ -103,6 +104,7 @@ HYD_Status HYD_DMX_Deregister_fd(int fd)
for (i = 0; i < cb_element->num_fds; i++) {
if (cb_element->fd[i] == fd) {
cb_element->fd[i] = -1;
num_cb_fds--;
goto fn_exit;
}
}
......@@ -114,8 +116,6 @@ HYD_Status HYD_DMX_Deregister_fd(int fd)
status = HYD_INTERNAL_ERROR;
goto fn_fail;
num_cb_fds--;
fn_exit:
HYDU_FUNC_EXIT();
return status;
......@@ -230,10 +230,6 @@ HYD_Status HYD_DMX_Finalize(void)
}
cb_list = NULL;
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -463,10 +463,6 @@ HYD_Status HYD_LCHI_Print_parameters(void)
HYDU_Print("\n");
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -142,12 +142,8 @@ HYD_Status HYD_LCHU_Free_host_list(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -213,12 +209,8 @@ HYD_Status HYD_LCHU_Free_env_list(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -236,12 +228,8 @@ HYD_Status HYD_LCHU_Free_io(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -258,12 +246,8 @@ HYD_Status HYD_LCHU_Free_exits(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -282,12 +266,8 @@ HYD_Status HYD_LCHU_Free_exec(void)
proc_params = proc_params->next;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -305,10 +285,6 @@ HYD_Status HYD_LCHU_Free_proc_params(void)
proc_params = run;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -7,6 +7,7 @@
#include "hydra.h"
#include "hydra_dbg.h"
#include "hydra_mem.h"
#include "hydra_sock.h"
#include "csi.h"
#include "pmcu_pmi.h"
#include "pmci.h"
......
......@@ -8,6 +8,7 @@
#include "hydra_dbg.h"
#include "csi.h"
#include "pmci.h"
#include "pmcu_pmi.h"
#include "bsci.h"
#include "demux.h"
#include "central.h"
......
......@@ -10,6 +10,7 @@
#include "hydra_mem.h"
#include "csi.h"
#include "pmci.h"
#include "pmcu_pmi.h"
#include "bsci.h"
#include "demux.h"
#include "central.h"
......
......@@ -7,7 +7,9 @@
#include "hydra.h"
#include "hydra_dbg.h"
#include "hydra_mem.h"
#include "hydra_sock.h"
#include "csi.h"
#include "bsci.h"
#include "pmcu_pmi.h"
HYD_CSI_Handle csi_handle;
......@@ -653,12 +655,8 @@ static HYD_Status free_pmi_process_list(HYD_PMCU_pmi_process_t * process_list)
process = tmp;
}
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......@@ -677,12 +675,8 @@ static HYD_Status free_pmi_kvs_list(HYD_PMCU_pmi_kvs_t * kvs_list)
}
HYDU_FREE(kvs_list);
fn_exit:
HYDU_FUNC_EXIT();
return status;
fn_fail:
goto fn_exit;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment