Fix: sessiond: assertion fails when getting name of trigger

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 52979af0d1fb0df1f8f99409b954e15520091cf2..4079d6ed9421273680d102d4bc9cf9353534dfb6 100644 (file)
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -23,8 +13,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
 
+#include <common/compat/errno.h>
 #include <common/common.h>
 #include <common/utils.h>
 
@@ -77,7 +67,7 @@ error:
  * On success, returns 0;
  * on error, returns -1.
  */
-static int create_config_file(char *path)
+static int create_config_file(const char *path)
 {
        int ret;
        FILE *fp;
@@ -155,7 +145,7 @@ end:
  */
 void config_destroy_default(void)
 {
-       char *path = utils_get_home_dir();
+       const char *path = utils_get_home_dir();
        if (path == NULL) {
                return;
        }
@@ -276,7 +266,7 @@ char *config_read_session_name_quiet(const char *path)
 int config_add_session_name(const char *path, const char *name)
 {
        int ret;
-       char *attr = "session=";
+       const char *attr = "session=";
        /* Max name len accepted plus attribute's len and the NULL byte. */
        char session_name[NAME_MAX + strlen(attr) + 1];
 
@@ -302,7 +292,7 @@ error:
 int config_init(const char *session_name)
 {
        int ret;
-       char *path;
+       const char *path;
 
        path = utils_get_home_dir();
        if (path == NULL) {