X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=c5432c392f884b58e38c84f7a0a59ed580dfa41e;hp=37c5ce383962e1b278e150a9dfac0a063998fd4e;hb=db8196db8e8c41b5705ffd87a73e019289091880;hpb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 37c5ce383..c5432c392 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -712,7 +712,7 @@ void fini_session_config_validation_ctx(
 }
 
 static
-char *get_session_config_xsd_path()
+char *get_session_config_xsd_path(void)
 {
 	char *xsd_path;
 	const char *base_path = lttng_secure_getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV);
@@ -4017,16 +4017,17 @@ int config_load_session(const char *path, const char *session_name,
 		/* Try home path */
 		home_path = utils_get_home_dir();
 		if (home_path) {
-			char path[PATH_MAX];
+			char path_buf[PATH_MAX];
 
 			/*
 			 * Try user session configuration path. Ignore error here so we can
 			 * continue loading the system wide sessions.
 			 */
 			if (autoload) {
-				ret = snprintf(path, sizeof(path),
-						DEFAULT_SESSION_HOME_CONFIGPATH "/"
-						DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path);
+				ret = snprintf(path_buf, sizeof(path_buf),
+						DEFAULT_SESSION_HOME_CONFIGPATH
+						"/" DEFAULT_SESSION_CONFIG_AUTOLOAD,
+						home_path);
 				if (ret < 0) {
 					PERROR("snprintf session autoload home config path");
 					ret = -LTTNG_ERR_INVALID;
@@ -4038,19 +4039,20 @@ int config_load_session(const char *path, const char *session_name,
 				 * avoid any user session daemon to try to load kernel sessions
 				 * automatically and failing all the times.
 				 */
-				ret = validate_path_creds(path);
+				ret = validate_path_creds(path_buf);
 				if (ret) {
-					path_ptr = path;
+					path_ptr = path_buf;
 				}
 			} else {
-				ret = snprintf(path, sizeof(path),
-						DEFAULT_SESSION_HOME_CONFIGPATH, home_path);
+				ret = snprintf(path_buf, sizeof(path_buf),
+						DEFAULT_SESSION_HOME_CONFIGPATH,
+						home_path);
 				if (ret < 0) {
 					PERROR("snprintf session home config path");
 					ret = -LTTNG_ERR_INVALID;
 					goto end;
 				}
-				path_ptr = path;
+				path_ptr = path_buf;
 			}
 			if (path_ptr) {
 				ret = load_session_from_path(path_ptr, session_name,