X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=28c21d5b8188ebd786d710cba5c1ceba8132154e;hp=7eaf27cdf3787cbf02d5c4fc2bc48eb43632b734;hb=c3ef76cdae5dbe3088de71a4f7d93a33d592d3d5;hpb=9ff0b09b3a6d4469ff42e489abc78352f42ebae8

diff --git a/src/common/macros.h b/src/common/macros.h
index 7eaf27cdf..28c21d5b8 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -106,17 +106,11 @@ void *zmalloc(size_t len)
 static inline
 int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 {
-	if (lttng_strnlen(src, dst_len) == dst_len) {
+	if (lttng_strnlen(src, dst_len) >= dst_len) {
 		/* Fail since copying would result in truncation. */
 		return -1;
 	}
-	strncpy(dst, src, dst_len);
-	/*
-	 * Be extra careful and put final \0 at the end after strncpy(),
-	 * even though we checked the length before. This makes Coverity
-	 * happy.
-	 */
-	dst[dst_len - 1] = '\0';
+	strcpy(dst, src);
 	return 0;
 }