projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: avoid -Wmaybe-uninitialized warning in validate_map_value_entry
[babeltrace.git]
/
src
/
plugins
/
common
/
param-validation
/
param-validation.c
diff --git
a/src/plugins/common/param-validation/param-validation.c
b/src/plugins/common/param-validation/param-validation.c
index bdca9f9a35a1cf5239146768553712b973f45943..ca80e888add31aa156ae4bbcec2c3730bb46d3d7 100644
(file)
--- a/
src/plugins/common/param-validation/param-validation.c
+++ b/
src/plugins/common/param-validation/param-validation.c
@@
-159,19
+159,21
@@
bt_bool validate_map_value_entry(const char *key,
const bt_value *value, void *v_data)
{
struct validate_map_value_data *data = v_data;
const bt_value *value, void *v_data)
{
struct validate_map_value_data *data = v_data;
- const struct bt_param_validation_map_value_entry_descr *
candidate
;
+ const struct bt_param_validation_map_value_entry_descr *
entry = NULL
;
guint i;
/* Check if this key is in the available keys. */
for (i = 0; i < data->available_keys->len; i++) {
guint i;
/* Check if this key is in the available keys. */
for (i = 0; i < data->available_keys->len; i++) {
- candidate = g_ptr_array_index(data->available_keys, i);
+ const struct bt_param_validation_map_value_entry_descr *candidate =
+ g_ptr_array_index(data->available_keys, i);
if (g_str_equal(key, candidate->key)) {
if (g_str_equal(key, candidate->key)) {
+ entry = candidate;
break;
}
}
break;
}
}
- if (
i < data->available_keys->len
) {
+ if (
entry
) {
/* Key was found in available keys. */
g_ptr_array_remove_index_fast(data->available_keys, i);
/* Key was found in available keys. */
g_ptr_array_remove_index_fast(data->available_keys, i);
@@
-179,7
+181,7
@@
bt_bool validate_map_value_entry(const char *key,
validate_ctx_push_map_scope(data->ctx, key);
/* Validate the value of the entry. */
validate_ctx_push_map_scope(data->ctx, key);
/* Validate the value of the entry. */
- data->status = validate_value(value, &
candidate
->value_descr,
+ data->status = validate_value(value, &
entry
->value_descr,
data->ctx);
validate_ctx_pop_scope(data->ctx);
data->ctx);
validate_ctx_pop_scope(data->ctx);
This page took
0.02528 seconds
and
4
git commands to generate.