X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=8ae6535d0de57ed1878bf42b98d37163fadccb49;hb=07bb6d71d12af83c72d9cc18a7488d6b15ceb440;hp=fc159c0af3c707102d7bb853a49360d16e01c1d1;hpb=331744e34f56a5aec69b05d356d6901e67926acc;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index fc159c0af..8ae6535d0 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -20,6 +20,8 @@
 #define _MACROS_H
 
 #include <stdlib.h>
+#include <string.h>
+#include <common/compat/string.h>
 
 /*
  * Takes a pointer x and transform it so we can use it to access members
@@ -46,7 +48,11 @@
 /*
  * Memory allocation zeroed
  */
-#define zmalloc(x) calloc(1, x)
+static inline
+void *zmalloc(size_t len)
+{
+	return calloc(1, len);
+}
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(array)   (sizeof(array) / (sizeof((array)[0])))
@@ -72,4 +78,30 @@
 #define LTTNG_HIDDEN __attribute__((visibility("hidden")))
 #endif
 
+#define member_sizeof(type, field)	sizeof(((type *) 0)->field)
+
+/*
+ * lttng_strncpy returns 0 on success, or nonzero on failure.
+ * It checks that the @src string fits into @dst_len before performing
+ * the copy. On failure, no copy has been performed.
+ *
+ * dst_len includes the string's trailing NULL.
+ */
+static inline
+int lttng_strncpy(char *dst, const char *src, size_t 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';
+	return 0;
+}
+
 #endif /* _MACROS_H */