Move to kernel style SPDX license identifiers

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args-default.c

diff --git a/src/cli/babeltrace2-cfg-cli-args-default.c b/src/cli/babeltrace2-cfg-cli-args-default.c
index b73457a2a869222b06fb1cbcc755680145bf6541..fa06dabb3778c8f0927aa6c93710caf9cc8adcef 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args-default.c
+++ b/src/cli/babeltrace2-cfg-cli-args-default.c
@@ -1,26 +1,12 @@
 /*
- * Copyright 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright 2017 - Philippe Proulx <pproulx@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * 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:
- *
- * 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 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
+#include <glib.h>
+
 #include <babeltrace2/babeltrace.h>
 #include "babeltrace2-cfg.h"
 #include "babeltrace2-cfg-cli-args.h"
@@ -35,7 +21,8 @@
 #ifdef BT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
 struct bt_config *bt_config_cli_args_create_with_default(int argc,
-               const char *argv[], int *retcode)
+               const char *argv[], int *retcode,
+               const bt_interrupter *interrupter)
 {
        bt_value *initial_plugin_paths;
        struct bt_config *cfg = NULL;
@@ -58,18 +45,18 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc,
         * plugin provider, if the env variable is already set, do not overwrite
         * it.
         */
-       setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0);
+       g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0);
 #else
        /*
         * If the Pyhton plugin provider is disabled, use a non-exitent path to avoid
         * loading the system installed provider if it exit, if the env variable is
         * already set, do not overwrite it.
         */
-       setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0);
+       g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0);
 #endif
 
        cfg = bt_config_cli_args_create(argc, argv, retcode, true, true,
-               initial_plugin_paths);
+               initial_plugin_paths, interrupter);
        goto end;
 
 error:
@@ -84,10 +71,11 @@ end:
 #else /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */
 
 struct bt_config *bt_config_cli_args_create_with_default(int argc,
-               const char *argv[], int *retcode)
+               const char *argv[], int *retcode,
+               const bt_interrupter *interrupter)
 {
        return bt_config_cli_args_create(argc, argv, retcode, false, false,
-               NULL);
+               NULL, interrupter);
 }
 
 #endif /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */