Skip to content

mca/base: fix typo in flag enumeration #1690

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
May 23, 2016
Merged

mca/base: fix typo in flag enumeration #1690

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion opal/mca/base/mca_base_var.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ static int var_set_from_string (mca_base_var_t *var, char *src)
case MCA_BASE_VAR_TYPE_BOOL:
case MCA_BASE_VAR_TYPE_SIZE_T:
ret = int_from_string(src, var->mbv_enumerator, &int_value);
if (OPAL_ERR_VALUE_OUT_OF_BOUNDS == ret ||
if (OPAL_SUCCESS != ret ||
(MCA_BASE_VAR_TYPE_INT == var->mbv_type && ((int) int_value != (int64_t) int_value)) ||
(MCA_BASE_VAR_TYPE_UNSIGNED_INT == var->mbv_type && ((unsigned int) int_value != int_value))) {
if (var->mbv_enumerator) {
Expand Down
19 changes: 13 additions & 6 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 @@ -494,21 +494,28 @@ static int enum_value_from_string_flag (mca_base_var_enum_t *self, const char *s

bool found = false, conflict = false;
for (int j = 0 ; j < count ; ++j) {
if ((is_int && (value == flag_enum->enum_flags[i].flag)) ||
0 == strcasecmp (flags[i], flag_enum->enum_flags[i].string)) {
if ((is_int && (value & flag_enum->enum_flags[j].flag)) ||
0 == strcasecmp (flags[i], flag_enum->enum_flags[j].string)) {
found = true;

if (flag & flag_enum->enum_flags[i].conflicting_flag) {
if (flag & flag_enum->enum_flags[j].conflicting_flag) {
conflict = true;
} else {
flag |= flag_enum->enum_flags[i].flag;
flag |= flag_enum->enum_flags[j].flag;
}

break;
if (is_int) {
value &= ~flag_enum->enum_flags[j].flag;
if (0 == value) {
break;
}
} else {
break;
}
}
}

if (!found || conflict) {
if (!found || conflict || (is_int && value)) {
opal_argv_free (flags);
return !found ? OPAL_ERR_VALUE_OUT_OF_BOUNDS : OPAL_ERR_BAD_PARAM;
}
Expand Down