Fix some errors in transition
This commit was SVN r31559.
Этот коммит содержится в:
родитель
b3f636d169
Коммит
9402380e1f
@ -27,6 +27,7 @@ static void process_open(int fd, short args, void *cbdata)
|
|||||||
orte_db_request_t *req = (orte_db_request_t*)cbdata;
|
orte_db_request_t *req = (orte_db_request_t*)cbdata;
|
||||||
orte_db_handle_t *hdl;
|
orte_db_handle_t *hdl;
|
||||||
orte_db_base_module_t *mod;
|
orte_db_base_module_t *mod;
|
||||||
|
orte_db_base_active_component_t *active;
|
||||||
orte_db_base_component_t *component;
|
orte_db_base_component_t *component;
|
||||||
int i, index;
|
int i, index;
|
||||||
char **cmps = NULL;
|
char **cmps = NULL;
|
||||||
@ -45,7 +46,8 @@ static void process_open(int fd, short args, void *cbdata)
|
|||||||
/* cycle thru the available components until one saids
|
/* cycle thru the available components until one saids
|
||||||
* it can create a handle for these properties
|
* it can create a handle for these properties
|
||||||
*/
|
*/
|
||||||
OPAL_LIST_FOREACH(component, &orte_db_base.actives, orte_db_base_component_t) {
|
OPAL_LIST_FOREACH(active, &orte_db_base.actives, orte_db_base_active_component_t) {
|
||||||
|
component = active->component;
|
||||||
found = true;
|
found = true;
|
||||||
if (NULL != cmps) {
|
if (NULL != cmps) {
|
||||||
found = false;
|
found = false;
|
||||||
|
@ -83,17 +83,20 @@ static orte_db_base_module_t *component_create(opal_list_t *props)
|
|||||||
|
|
||||||
/* if the props include a filename, then use it */
|
/* if the props include a filename, then use it */
|
||||||
found = false;
|
found = false;
|
||||||
|
if (NULL != props) {
|
||||||
OPAL_LIST_FOREACH(kv, props, opal_value_t) {
|
OPAL_LIST_FOREACH(kv, props, opal_value_t) {
|
||||||
if (0 == strcmp(kv->key, "printfile")) {
|
if (0 == strcmp(kv->key, "printfile")) {
|
||||||
file = kv->data.string;
|
file = kv->data.string;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (!found) {
|
if (!found) {
|
||||||
/* otherwise, fall back to the default */
|
/* otherwise, fall back to the default */
|
||||||
if (NULL != filename) {
|
if (NULL != filename) {
|
||||||
file = filename;
|
file = filename;
|
||||||
} else {
|
} else {
|
||||||
/* nothing for us to do */
|
/* nothing for us to do */
|
||||||
|
opal_output(0, "PRINT RETURNING NULL");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user