summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
594c7c0)
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 <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
/* Try home path */
home_path = utils_get_home_dir();
if (home_path) {
/* Try home path */
home_path = utils_get_home_dir();
if (home_path) {
+ char path_buf[PATH_MAX];
/*
* Try user session configuration path. Ignore error here so we can
* continue loading the system wide sessions.
*/
if (autoload) {
/*
* 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;
if (ret < 0) {
PERROR("snprintf session autoload home config path");
ret = -LTTNG_ERR_INVALID;
* avoid any user session daemon to try to load kernel sessions
* automatically and failing all the times.
*/
* 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);
- 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;
}
if (ret < 0) {
PERROR("snprintf session home config path");
ret = -LTTNG_ERR_INVALID;
goto end;
}
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,