From 764d8fd9edb022ac415f831bec0d262052de0eb1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 26 Aug 2019 16:26:33 -0400 Subject: [PATCH] autodisc: cast when assigning to different enum type Gets rid of these warnings with clang: /home/smarchi/src/babeltrace/src/autodisc/autodisc.c:766:13: warning: implicit conversion from enumeration type 'auto_source_discovery_internal_status' (aka 'enum auto_source_discovery_internal_status') to different enumeration type 'auto_source_discovery_status' (aka 'enum auto_source_discovery_status') [-Wenum-conversion] status = internal_status; ~ ^~~~~~~~~~~~~~~ /home/smarchi/src/babeltrace/src/autodisc/autodisc.c:778:13: warning: implicit conversion from enumeration type 'auto_source_discovery_internal_status' (aka 'enum auto_source_discovery_internal_status') to different enumeration type 'auto_source_discovery_status' (aka 'enum auto_source_discovery_status') [-Wenum-conversion] status = internal_status; ~ ^~~~~~~~~~~~~~~ Change-Id: Id4cdaaf20da1789e604d346ff2c08239352eb381 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/1975 Tested-by: jenkins Reviewed-by: Francis Deslauriers --- src/autodisc/autodisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/autodisc/autodisc.c b/src/autodisc/autodisc.c index 6ba393e8..1b15c1a1 100644 --- a/src/autodisc/autodisc.c +++ b/src/autodisc/autodisc.c @@ -763,7 +763,7 @@ auto_source_discovery_status auto_discover_source_components( log_level, auto_disc, interrupter); if (internal_status < 0 || internal_status == AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_INTERRUPTED) { /* Fatal error or we got interrupted. */ - status = internal_status; + status = (auto_source_discovery_status) internal_status; goto end; } else if (internal_status == AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_OK) { /* A component class has claimed this input as an arbitrary string. */ @@ -775,7 +775,7 @@ auto_source_discovery_status auto_discover_source_components( component_class_restrict, log_level, auto_disc, interrupter); if (internal_status < 0 || internal_status == AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_INTERRUPTED) { /* Fatal error or we got interrupted. */ - status = internal_status; + status = (auto_source_discovery_status) internal_status; goto end; } else if (internal_status == 0) { /* -- 2.34.1