Build fix: implicit declaration of function 'PERROR' on Solaris

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index d6c67bb0f368bac63699b85c05dc399d8d292a08..7006a21581ea91f952c7d7dbe57a1095d467979e 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -294,7 +294,7 @@ int expand_double_slashes_dot_and_dotdot(char *path)
                 * Copy the current token which is neither a '.' nor a '..'.
                 */
                path[expanded_path_len++] = '/';
-               memcpy(&path[expanded_path_len], curr_char, curr_token_len);
+               memmove(&path[expanded_path_len], curr_char, curr_token_len);
                expanded_path_len += curr_token_len;
        }
 
@@ -736,7 +736,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
                char *out_stream_path, size_t stream_path_len)
 {
        int ret;
-        char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
+       char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
        const char *path_separator;
 
        if (path_name && (path_name[0] == '\0' ||
@@ -754,7 +754,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
                assert(ret > 0 && ret < sizeof(count_str));
        }
 
-        ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
+       ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
                        path_name, path_separator, file_name, count_str,
                        suffix);
        if (ret < 0 || ret >= stream_path_len) {