Skip to content

mca/base: accept y and n for bool and auto bool enumerator #3245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2017
Merged

mca/base: accept y and n for bool and auto bool enumerator #3245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions opal/mca/base/mca_base_var_enum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
Expand Down Expand Up @@ -70,18 +70,20 @@ static int mca_base_var_enum_bool_vfs (mca_base_var_enum_t *self, const char *st
int *value)
{
char *tmp;
int v;
long v;

/* skip whitespace */
string_value += strspn (string_value, " \t\n\v\f\r");

v = strtol (string_value, &tmp, 10);
if (*tmp != '\0') {
if (0 == strcmp (string_value, "true") || 0 == strcmp (string_value, "t") ||
0 == strcmp (string_value, "enabled") || 0 == strcmp (string_value, "yes")) {
0 == strcmp (string_value, "enabled") || 0 == strcmp (string_value, "yes") ||
0 == strcmp (string_value, "y")) {
v = 1;
} else if (0 == strcmp (string_value, "false") || 0 == strcmp (string_value, "f") ||
0 == strcmp (string_value, "disabled") || 0 == strcmp (string_value, "no")) {
0 == strcmp (string_value, "disabled") || 0 == strcmp (string_value, "no") ||
0 == strcmp (string_value, "n")) {
v = 0;
} else {
return OPAL_ERR_VALUE_OUT_OF_BOUNDS;
Expand All @@ -105,7 +107,7 @@ static int mca_base_var_enum_bool_sfv (mca_base_var_enum_t *self, const int valu

static int mca_base_var_enum_bool_dump (mca_base_var_enum_t *self, char **out)
{
*out = strdup ("0: f|false|disabled|no, 1: t|true|enabled|yes");
*out = strdup ("0: f|false|disabled|no|n, 1: t|true|enabled|yes|y");
return *out ? OPAL_SUCCESS : OPAL_ERR_OUT_OF_RESOURCE;
}

Expand Down Expand Up @@ -146,18 +148,20 @@ static int mca_base_var_enum_auto_bool_vfs (mca_base_var_enum_t *self, const cha
int *value)
{
char *tmp;
int v;
long v;

/* skip whitespace */
string_value += strspn (string_value, " \t\n\v\f\r");

v = strtol (string_value, &tmp, 10);
if (*tmp != '\0') {
if (0 == strcasecmp (string_value, "true") || 0 == strcasecmp (string_value, "t") ||
0 == strcasecmp (string_value, "enabled") || 0 == strcasecmp (string_value, "yes")) {
0 == strcasecmp (string_value, "enabled") || 0 == strcasecmp (string_value, "yes") ||
0 == strcasecmp (string_value, "y")) {
v = 1;
} else if (0 == strcasecmp (string_value, "false") || 0 == strcasecmp (string_value, "f") ||
0 == strcasecmp (string_value, "disabled") || 0 == strcasecmp (string_value, "no")) {
0 == strcasecmp (string_value, "disabled") || 0 == strcasecmp (string_value, "no") ||
0 == strcasecmp (string_value, "n")) {
v = 0;
} else if (0 == strcasecmp (string_value, "auto")) {
v = -1;
Expand All @@ -171,7 +175,7 @@ static int mca_base_var_enum_auto_bool_vfs (mca_base_var_enum_t *self, const cha
} else if (v < -1) {
*value = -1;
} else {
*value = v;
*value = (int) v;
}

return OPAL_SUCCESS;
Expand All @@ -195,7 +199,7 @@ static int mca_base_var_enum_auto_bool_sfv (mca_base_var_enum_t *self, const int

static int mca_base_var_enum_auto_bool_dump (mca_base_var_enum_t *self, char **out)
{
*out = strdup ("-1: auto, 0: f|false|disabled|no, 1: t|true|enabled|yes");
*out = strdup ("-1: auto, 0: f|false|disabled|no|n, 1: t|true|enabled|yes|y");
return *out ? OPAL_SUCCESS : OPAL_ERR_OUT_OF_RESOURCE;
}

Expand Down