From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sun, 7 Apr 2019 18:39:08 +0000 (-0400)
Subject: lttng: make the configuration file interface const correct
X-Git-Tag: v2.12.0-rc1~623
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9b27c72144f412ea2749a3ed18b49568881599a8;p=lttng-tools.git

lttng: make the configuration file interface const correct

The interface defined in conf.h is not const-correct thus hindering
the use of const-correct code in the CLI client.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 6fc3e6051..52979af0d 100644
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -34,7 +34,7 @@
  * Returns the path with '/CONFIG_FILENAME' added to it;
  * path will be NULL if an error occurs.
  */
-char *config_get_file_path(char *path)
+char *config_get_file_path(const char *path)
 {
 	int ret;
 	char *file_path;
@@ -52,7 +52,7 @@ char *config_get_file_path(char *path)
  * Returns an open FILE pointer to the config file;
  * on error, NULL is returned.
  */
-static FILE *open_config(char *path, const char *mode)
+static FILE *open_config(const char *path, const char *mode)
 {
 	FILE *fp = NULL;
 	char *file_path;
@@ -100,7 +100,7 @@ error:
  * On success, returns 0;
  * on error, returns -1.
  */
-static int write_config(char *file_path, size_t size, char *data)
+static int write_config(const char *file_path, size_t size, char *data)
 {
 	FILE *fp;
 	size_t len;
@@ -127,7 +127,7 @@ end:
 /*
  * Destroys directory config and file config.
  */
-void config_destroy(char *path)
+void config_destroy(const char *path)
 {
 	int ret;
 	char *config_path;
@@ -178,7 +178,7 @@ int config_exists(const char *path)
 }
 
 static
-int _config_read_session_name(char *path, char **name)
+int _config_read_session_name(const char *path, char **name)
 {
 	int ret = 0;
 	FILE *fp;
@@ -238,7 +238,7 @@ found:
  * The caller is responsible for freeing the returned string.
  * On error, NULL is returned.
  */
-char *config_read_session_name(char *path)
+char *config_read_session_name(const char *path)
 {
 	int ret;
 	char *name = NULL;
@@ -260,7 +260,7 @@ char *config_read_session_name(char *path)
  * The caller is responsible for freeing the returned string.
  * On error, NULL is returned.
  */
-char *config_read_session_name_quiet(char *path)
+char *config_read_session_name_quiet(const char *path)
 {
 	char *name = NULL;
 
@@ -273,7 +273,7 @@ char *config_read_session_name_quiet(char *path)
  * On success, returns 0;
  * on error, returns -1.
  */
-int config_add_session_name(char *path, char *name)
+int config_add_session_name(const char *path, const char *name)
 {
 	int ret;
 	char *attr = "session=";
@@ -299,7 +299,7 @@ error:
  * On success, returns 0;
  * on error, returns -1.
  */
-int config_init(char *session_name)
+int config_init(const char *session_name)
 {
 	int ret;
 	char *path;
diff --git a/src/bin/lttng/conf.h b/src/bin/lttng/conf.h
index a26a6b8e3..1772bd48f 100644
--- a/src/bin/lttng/conf.h
+++ b/src/bin/lttng/conf.h
@@ -20,15 +20,15 @@
 
 #define CONFIG_FILENAME ".lttngrc"
 
-void config_destroy(char *path);
+void config_destroy(const char *path);
 void config_destroy_default(void);
 int config_exists(const char *path);
-int config_init(char *path);
-int config_add_session_name(char *path, char *name);
+int config_init(const char *path);
+int config_add_session_name(const char *path, const char *name);
 
 /* Must free() the return pointer */
-char *config_read_session_name(char *path);
-char *config_read_session_name_quiet(char *path);
-char *config_get_file_path(char *path);
+char *config_read_session_name(const char *path);
+char *config_read_session_name_quiet(const char *path);
+char *config_get_file_path(const char *path);
 
 #endif /* _LTTNG_CONFIG_H */