1
1

Merge pull request #2676 from rhc54/topic/alps

Minor cleanups to eliminate warnings
Этот коммит содержится в:
Ralph Castain 2017-01-06 12:43:42 -08:00 коммит произвёл GitHub
родитель 39d880f65d 684e69695f
Коммит ca16f3f9ed

Просмотреть файл

@ -14,7 +14,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -80,7 +80,7 @@ static void component_shutdown(void);
static int component_send(orte_rml_send_t *msg); static int component_send(orte_rml_send_t *msg);
static char* component_get_addr(void); static char* component_get_addr(void);
static int component_set_addr(orte_process_name_t *peer, char **uris); static int component_set_addr(orte_process_name_t *peer, char **uris);
static bool component_is_reachable(orte_process_name_t *peer); static bool component_is_reachable(char *routed, orte_process_name_t *peer);
#if OPAL_ENABLE_FT_CR == 1 #if OPAL_ENABLE_FT_CR == 1
static int component_ft_event(int state); static int component_ft_event(int state);
#endif #endif
@ -193,7 +193,6 @@ static int component_send(orte_rml_send_t *msg)
static char* component_get_addr(void) static char* component_get_addr(void)
{ {
int len;
char hn[OPAL_MAXHOSTNAMELEN], *cptr; char hn[OPAL_MAXHOSTNAMELEN], *cptr;
/* /*
@ -201,7 +200,7 @@ static char* component_get_addr(void)
* eventually be able to support connect/accept using aprun. * eventually be able to support connect/accept using aprun.
*/ */
len = gethostname(hn, sizeof(hn)); gethostname(hn, sizeof(hn));
asprintf(&cptr, "gni://%s:%d", hn, getpid()); asprintf(&cptr, "gni://%s:%d", hn, getpid());
@ -220,7 +219,7 @@ static int component_set_addr(orte_process_name_t *peer,
return ORTE_ERR_NOT_SUPPORTED; return ORTE_ERR_NOT_SUPPORTED;
} }
static bool component_is_reachable(orte_process_name_t *peer) static bool component_is_reachable(char *routed, orte_process_name_t *peer)
{ {
opal_output_verbose(10, orte_oob_base_framework.framework_output, opal_output_verbose(10, orte_oob_base_framework.framework_output,
"%s oob:alps: component_set_addr invoked - this should not be happening", "%s oob:alps: component_set_addr invoked - this should not be happening",