X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=c521aacd5f3df8f582502ce8faa9f29feb1c9063;hp=90849ed30ae5e543a577f9214bc33152864751f8;hb=d0927b411543c173c4fb83abf785fd71a9d29ed1;hpb=70c6956ba2dcd36f4e44158a0b27621eda336a6a

diff --git a/src/common/macros.h b/src/common/macros.h
index 90849ed30..c521aacd5 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -20,6 +20,7 @@
 #define _MACROS_H
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <common/compat/string.h>
 
@@ -58,6 +59,14 @@ void *zmalloc(size_t len)
 #define ARRAY_SIZE(array)   (sizeof(array) / (sizeof((array)[0])))
 #endif
 
+#ifndef container_of
+#define container_of(ptr, type, member)					\
+	({								\
+		const typeof(((type *)NULL)->member) * __ptr = (ptr);	\
+		(type *)((char *)__ptr - offsetof(type, member));	\
+	})
+#endif
+
 #ifndef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #endif
@@ -70,10 +79,20 @@ void *zmalloc(size_t len)
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
+#ifndef min_t
+#define min_t(type, a, b)	((type) min(a, b))
+#endif
+
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
 
+/*
+ * Align value to the next multiple of align. Returns val if it already is a
+ * multiple of align. Align must be a power of two.
+ */
+#define ALIGN_TO(value, align) ((value + (align - 1)) & ~(align - 1))
+
 /*
  * LTTNG_HIDDEN: set the hidden attribute for internal functions
  * On Windows, symbols are local unless explicitly exported,
@@ -97,17 +116,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;
 }