Silence strncpy warning emitted by GCC 8 in XSD path construction

[lttng-tools.git] / src / common / config / session-config.c

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 0d75a088d402e17076b53994fb6f6915b0d8f13c..01ae901ad8c35a168611552f4346e1a649bfebe3 100644 (file)
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -677,13 +677,12 @@ char *get_session_config_xsd_path()
                goto end;
        }
 
-       strncpy(xsd_path, base_path, max_path_len);
+       strcpy(xsd_path, base_path);
        if (xsd_path[base_path_len - 1] != '/') {
                xsd_path[base_path_len++] = '/';
        }
 
-       strncpy(xsd_path + base_path_len, DEFAULT_SESSION_CONFIG_XSD_FILENAME,
-               max_path_len - base_path_len);
+       strcpy(xsd_path + base_path_len, DEFAULT_SESSION_CONFIG_XSD_FILENAME);
 end:
        return xsd_path;
 }
@@ -1345,10 +1344,6 @@ end:
 
 static
 int create_session(const char *name,
-       struct lttng_domain *kernel_domain,
-       struct lttng_domain *ust_domain,
-       struct lttng_domain *jul_domain,
-       struct lttng_domain *log4j_domain,
        xmlNodePtr output_node,
        uint64_t live_timer_interval,
        const struct config_load_session_override_attr *overrides)
@@ -2785,13 +2780,11 @@ domain_init_error:
                                overrides);
        } else if (live_timer_interval &&
                live_timer_interval != UINT64_MAX) {
-               ret = create_session((const char *) name, kernel_domain,
-                               ust_domain, jul_domain, log4j_domain,
+               ret = create_session((const char *) name,
                                output_node, live_timer_interval, overrides);
        } else {
                /* regular session */
-               ret = create_session((const char *) name, kernel_domain,
-                               ust_domain, jul_domain, log4j_domain,
+               ret = create_session((const char *) name,
                                output_node, UINT64_MAX, overrides);
        }
        if (ret) {