autodisc: cast when assigning to different enum type
authorSimon Marchi <simon.marchi@efficios.com>
Mon, 26 Aug 2019 20:26:33 +0000 (16:26 -0400)
committerFrancis Deslauriers <francis.deslauriers@efficios.com>
Mon, 26 Aug 2019 20:58:58 +0000 (16:58 -0400)
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 <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1975
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
src/autodisc/autodisc.c

index 6ba393e8f5323f01e157c37ac5ab63c380cca7e7..1b15c1a18cd3b4aa927ea1514be7eafd578a1bb4 100644 (file)
@@ -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) {
                        /*
This page took 0.025889 seconds and 4 git commands to generate.