From db8196db8e8c41b5705ffd87a73e019289091880 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 31 Mar 2021 14:37:15 -0400 Subject: [PATCH] Clean-up: config: fix -Wshadow error in config_load_session MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix: CC libconfig_la-session-config.lo /home/simark/src/lttng-tools/src/common/config/session-config.c: In function ‘config_load_session’: /home/simark/src/lttng-tools/src/common/config/session-config.c:4020:9: error: declaration of ‘path’ shadows a parameter [-Werror=shadow] 4020 | char path[PATH_MAX]; | ^~~~ /home/simark/src/lttng-tools/src/common/config/session-config.c:3999:37: note: shadowed declaration is here 3999 | int config_load_session(const char *path, const char *session_name, | ~~~~~~~~~~~~^~~~ Change-Id: Id7d5f6fcf0e88f43dee420dfb174d9bf01aa8fbd Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau --- src/common/config/session-config.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index 49c06a353..c5432c392 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -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, -- 2.34.1