From ecacde0cd58f4aae955b8982bc6baa96afa47ed0 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 23 Jun 2017 11:11:00 -0700 Subject: [PATCH] Purge whitespace errors Signed-off-by: Ralph Castain --- opal/util/cmd_line.c | 8 ++++---- opal/util/info.c | 6 +++--- opal/util/info_subscriber.c | 39 +++++++++++++++++++------------------ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/opal/util/cmd_line.c b/opal/util/cmd_line.c index c86fd123a8..7418ae8c9b 100644 --- a/opal/util/cmd_line.c +++ b/opal/util/cmd_line.c @@ -15,7 +15,7 @@ * Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016 Intel, Inc. All rights reserved + * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -402,8 +402,8 @@ int opal_cmd_line_parse(opal_cmd_line_t *cmd, bool ignore_unknown, bool ignore_u which can have 0 or 1 arguments */ if (i >= cmd->lcl_argc) { /* If this is a help request, can have no arguments */ - if((NULL != option->clo_single_dash_name && - 0 == strcmp(option->clo_single_dash_name, "h")) || + if((NULL != option->clo_single_dash_name && + 0 == strcmp(option->clo_single_dash_name, "h")) || (NULL != option->clo_long_name && 0 == strcmp(option->clo_long_name, "help"))) { help_without_arg = true; @@ -466,7 +466,7 @@ int opal_cmd_line_parse(opal_cmd_line_t *cmd, bool ignore_unknown, bool ignore_u } /* If there are no options to this command or it is - a help request with no argument, see if we need to + a help request with no argument, see if we need to set a boolean value to "true". */ if (0 == option->clo_num_params || help_without_arg) { diff --git a/opal/util/info.c b/opal/util/info.c index 48cfd90775..01eecd93ed 100644 --- a/opal/util/info.c +++ b/opal/util/info.c @@ -17,6 +17,7 @@ * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -338,7 +339,7 @@ int opal_info_get_bool(opal_info_t *info, char *key, bool *value, int *flag) str[sizeof(str) - 1] = '\0'; opal_info_get(info, key, sizeof(str) - 1, str, flag); if (*flag) { - *value = opal_str_to_bool(str); + *value = opal_str_to_bool(str); } return OPAL_SUCCESS; @@ -373,7 +374,7 @@ opal_str_to_bool(char *str) /* RHC unrecognized value -- print a warning? */ } } - return result; + return result; } /* @@ -587,4 +588,3 @@ opal_info_value_to_bool(char *value, bool *interp) return OPAL_ERR_BAD_PARAM; } - diff --git a/opal/util/info_subscriber.c b/opal/util/info_subscriber.c index e03d9ca766..bc16bd51db 100644 --- a/opal/util/info_subscriber.c +++ b/opal/util/info_subscriber.c @@ -17,6 +17,7 @@ * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -61,16 +62,16 @@ struct opal_callback_list_item_t { typedef struct opal_callback_list_item_t opal_callback_list_item_t; OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_infosubscriber_t); -OBJ_CLASS_INSTANCE(opal_infosubscriber_t, - opal_object_t, - infosubscriber_construct, +OBJ_CLASS_INSTANCE(opal_infosubscriber_t, + opal_object_t, + infosubscriber_construct, infosubscriber_destruct); OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_callback_list_item_t); static void opal_callback_list_item_destruct(opal_callback_list_item_t *obj); -OBJ_CLASS_INSTANCE(opal_callback_list_item_t, - opal_list_item_t, - NULL, +OBJ_CLASS_INSTANCE(opal_callback_list_item_t, + opal_list_item_t, + NULL, opal_callback_list_item_destruct); static void infosubscriber_construct(opal_infosubscriber_t *obj) { @@ -113,10 +114,10 @@ static char* opal_infosubscribe_inform_subscribers(opal_infosubscriber_t *object if (found_callback) { *found_callback = 0; } /* - * Present the new value to each subscriber. They can decide to accept it, ignore it, or + * Present the new value to each subscriber. They can decide to accept it, ignore it, or * over-ride it with their own value (like ignore, but they specify what value they want it to have). * - * Since multiple subscribers could set values, only the last setting is kept as the + * Since multiple subscribers could set values, only the last setting is kept as the * returned value. */ if (table) { @@ -125,7 +126,7 @@ static char* opal_infosubscribe_inform_subscribers(opal_infosubscriber_t *object if (list) { updated_value = new_value; OPAL_LIST_FOREACH(item, list, opal_callback_list_item_t) { - updated_value = item->callback(object, key, updated_value); + updated_value = item->callback(object, key, updated_value); if (found_callback) { *found_callback = 1; } } } @@ -186,10 +187,10 @@ opal_infosubscribe_testregister(opal_infosubscriber_t *object) strlen(testing_keys[i]), (void**) &list); if (list) { OPAL_LIST_FOREACH(item, list, opal_callback_list_item_t) { - if (0 == + if (0 == strcmp(item->default_value, testing_initialvals[i]) && - item->callback == testing_callbacks[i]) + item->callback == testing_callbacks[i]) { found = 1; } @@ -234,7 +235,7 @@ opal_infosubscribe_testregister(opal_infosubscriber_t *object) "in hash table\n"); exit(-1); } - + err = opal_hash_table_get_next_key_ptr(table, (void**) &next_key, &key_size, (void**) &list, node, &node); } @@ -294,13 +295,13 @@ opal_infosubscribe_change_info(opal_infosubscriber_t *object, opal_info_t *new_i if (!object->s_info) { object->s_info = OBJ_NEW(opal_info_t); } - + if (NULL != new_info) { OPAL_LIST_FOREACH(iterator, &new_info->super, opal_info_entry_t) { - + updated_value = opal_infosubscribe_inform_subscribers(object, iterator->ie_key, iterator->ie_value, &found_callback); if (updated_value) { - err = opal_info_set(object->s_info, iterator->ie_key, updated_value); + err = opal_info_set(object->s_info, iterator->ie_key, updated_value); } else { // This path would happen if there was no callback for this key, // or if there was a callback and it returned null. One way the @@ -355,15 +356,15 @@ int opal_infosubscribe_subscribe(opal_infosubscriber_t *object, char *key, char opal_hash_table_set_value_ptr(table, key, strlen(key), list); } - callback_list_item = OBJ_NEW(opal_callback_list_item_t); + callback_list_item = OBJ_NEW(opal_callback_list_item_t); callback_list_item->callback = callback; - if (value) { + if (value) { callback_list_item->default_value = strdup(value); } else { callback_list_item->default_value = NULL; } - opal_list_append(list, (opal_list_item_t*) callback_list_item); + opal_list_append(list, (opal_list_item_t*) callback_list_item); // Trigger callback() on either the default value or the info that's in the // object if there is one. Unfortunately there's some code duplication as @@ -412,7 +413,7 @@ int opal_infosubscribe_subscribe(opal_infosubscriber_t *object, char *key, char } else { /* * TODO: This should not happen - */ + */ } return OPAL_SUCCESS;