Skip to content

Commit ff2dd69

Browse files
committed
opal/util: silence warning in opal_info_dup_mode()
as reported by coverity with CID 1414729 Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 85ff3eb commit ff2dd69

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

opal/util/info.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int opal_info_dup (opal_info_t *info, opal_info_t **newinfo)
9393
return OPAL_SUCCESS;
9494
}
9595

96-
static int opal_info_get_nolock (opal_info_t *info, const char *key, int valuelen,
96+
static void opal_info_get_nolock (opal_info_t *info, const char *key, int valuelen,
9797
char *value, int *flag)
9898
{
9999
opal_info_entry_t *search;
@@ -125,7 +125,6 @@ static int opal_info_get_nolock (opal_info_t *info, const char *key, int valuele
125125
}
126126
}
127127
}
128-
return OPAL_SUCCESS;
129128
}
130129

131130
static int opal_info_set_nolock (opal_info_t *info, const char *key, const char *value)
@@ -208,8 +207,8 @@ int opal_info_dup_mode (opal_info_t *info, opal_info_t **newinfo,
208207
// see if there is an __IN_<key> for the current <key>
209208
if (strlen(iterator->ie_key) + 5 < OPAL_MAX_INFO_KEY) {
210209
sprintf(savedkey, "__IN_%s", iterator->ie_key);
211-
err = opal_info_get_nolock (info, savedkey, OPAL_MAX_INFO_VAL,
212-
savedval, &flag);
210+
opal_info_get_nolock (info, savedkey, OPAL_MAX_INFO_VAL,
211+
savedval, &flag);
213212
} else {
214213
flag = 0;
215214
}
@@ -308,12 +307,10 @@ int opal_info_set_value_enum (opal_info_t *info, const char *key, int value,
308307
int opal_info_get (opal_info_t *info, const char *key, int valuelen,
309308
char *value, int *flag)
310309
{
311-
int ret;
312-
313310
OPAL_THREAD_LOCK(info->i_lock);
314-
ret = opal_info_get_nolock(info, key, valuelen, value, flag);
311+
opal_info_get_nolock(info, key, valuelen, value, flag);
315312
OPAL_THREAD_UNLOCK(info->i_lock);
316-
return ret;
313+
return OPAL_SUCCESS;
317314
}
318315

319316
int opal_info_get_value_enum (opal_info_t *info, const char *key, int *value,

0 commit comments

Comments
 (0)