configure: remove -Wno-format-nonliteral

[babeltrace.git] / src / autodisc / autodisc.c

diff --git a/src/autodisc/autodisc.c b/src/autodisc/autodisc.c
index 05b5ed25f2006cbaaa319ec3fdae14a6706eccc8..1a4f07dc39d537011f01428cb1d120d34dd02208 100644 (file)
--- a/src/autodisc/autodisc.c
+++ b/src/autodisc/autodisc.c
@@ -1,29 +1,15 @@
 /*
- * Copyright (c) 2019 EfficiOS Inc. and Linux Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) 2019 EfficiOS Inc. and Linux Foundation
  */
 
 #define BT_LOG_TAG "CLI-CFG-SRC-AUTO-DISC"
 #define BT_LOG_OUTPUT_LEVEL log_level
 #include "logging/log.h"
 
+#include <stdbool.h>
+
 #include "autodisc.h"
 #include "common/common.h"
 
@@ -458,17 +444,10 @@ auto_source_discovery_internal_status support_info_query_all_sources(
                                        }
 
                                        if (bt_value_map_has_entry(query_result, "group")) {
-                                               enum bt_value_type group_value_type;
-
                                                group_value = bt_value_map_borrow_entry_value_const(query_result, "group");
                                                BT_ASSERT(group_value);
 
-                                               group_value_type = bt_value_get_type(group_value);
-
-                                               if (group_value_type == BT_VALUE_TYPE_NULL) {
-                                                       /* Do as if no value was passed. */
-                                                       group_value = NULL;
-                                               } else if (bt_value_get_type(group_value) != BT_VALUE_TYPE_STRING) {
+                                               if (bt_value_get_type(group_value) != BT_VALUE_TYPE_STRING) {
                                                        BT_LOGW("babeltrace.support-info query: unexpected type for entry `group`: "
                                                                "component-class-name=source.%s.%s, input=%s, input-type=%s, "
                                                                "expected-entry-type=%s,%s, actual-entry-type=%s",
@@ -633,18 +612,19 @@ auto_source_discovery_internal_status auto_discover_source_for_input_as_dir_or_f
 
                dir = g_dir_open(input->str, 0, &error);
                if (!dir) {
-                       const char *fmt = "Failed to open directory %s: %s";
-                       BT_LOGW(fmt, input->str, error->message);
+#define BT_FMT "Failed to open directory %s: %s"
+                       BT_LOGW(BT_FMT, input->str, error->message);
 
                        if (error->code == G_FILE_ERROR_ACCES) {
                                /* This is not a fatal error, we just skip it. */
                                status = AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_NO_MATCH;
                                goto end;
                        } else {
-                               BT_AUTODISC_LOGE_APPEND_CAUSE(fmt, input->str,
+                               BT_AUTODISC_LOGE_APPEND_CAUSE(BT_FMT, input->str,
                                        error->message);
                                goto error;
                        }
+#undef BT_FMT
                }
 
                saved_input_len = input->len;