From: Simon Marchi <simon.marchi@efficios.com>
Date: Fri, 11 Oct 2019 14:56:39 +0000 (-0400)
Subject: Fix: don't use BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR
X-Git-Tag: v2.0.0-rc1~26
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=9ffc945a30dd432486f45c7f0a2807dc7fec5d05

Fix: don't use BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR

BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR has been removed,
so don't use it in validate_map_value.

Fixes the following compilation error:

    /home/smarchi/src/babeltrace/src/plugins/common/param-validation/param-validation.c: In function ‘validate_map_value’:
    /home/smarchi/src/babeltrace/src/plugins/common/param-validation/param-validation.c:226:30: error: ‘BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR’ undeclared (first use in this function); did you mean ‘BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED’?
      if (foreach_entry_status == BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR) {
                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                  BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED

Change-Id: Idc4ed1b198bfa40c9b3ba9d9532d69795f893c90
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2174
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---

diff --git a/src/plugins/common/param-validation/param-validation.c b/src/plugins/common/param-validation/param-validation.c
index 755310e5..bdca9f9a 100644
--- a/src/plugins/common/param-validation/param-validation.c
+++ b/src/plugins/common/param-validation/param-validation.c
@@ -223,16 +223,14 @@ enum bt_param_validation_status validate_map_value(
 
 	foreach_entry_status = bt_value_map_foreach_entry_const(map,
 		validate_map_value_entry, &data);
-	if (foreach_entry_status == BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR) {
-		status = BT_PARAM_VALIDATION_STATUS_MEMORY_ERROR;
-		goto end;
-	}
-
-	if (data.status != BT_PARAM_VALIDATION_STATUS_OK) {
+	if (foreach_entry_status == BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED) {
+		BT_ASSERT(data.status != BT_PARAM_VALIDATION_STATUS_OK);
 		status = data.status;
 		goto end;
 	}
 
+	BT_ASSERT(data.status == BT_PARAM_VALIDATION_STATUS_OK);
+
 	for (i = 0; i < data.available_keys->len; i++) {
 		const struct bt_param_validation_map_value_entry_descr *entry =
 			g_ptr_array_index(data.available_keys, i);