projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Connect timeout arithmetic in inet/inet6 (v4)
[lttng-tools.git]
/
src
/
common
/
macros.h
diff --git
a/src/common/macros.h
b/src/common/macros.h
index 90849ed30ae5e543a577f9214bc33152864751f8..c42cddd5050ca163a612e9f1744f9b7aaf03da5b 100644
(file)
--- a/
src/common/macros.h
+++ b/
src/common/macros.h
@@
-20,6
+20,7
@@
#define _MACROS_H
#include <stdlib.h>
#define _MACROS_H
#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
#include <common/compat/string.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
#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
#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
#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
#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,
/*
* LTTNG_HIDDEN: set the hidden attribute for internal functions
* On Windows, symbols are local unless explicitly exported,
@@
-87,6
+106,8
@@
void *zmalloc(size_t len)
#define member_sizeof(type, field) sizeof(((type *) 0)->field)
#define member_sizeof(type, field) sizeof(((type *) 0)->field)
+#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+
/*
* lttng_strncpy returns 0 on success, or nonzero on failure.
* It checks that the @src string fits into @dst_len before performing
/*
* lttng_strncpy returns 0 on success, or nonzero on failure.
* It checks that the @src string fits into @dst_len before performing
@@
-97,17
+118,11
@@
void *zmalloc(size_t len)
static inline
int lttng_strncpy(char *dst, const char *src, size_t dst_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;
}
/* 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;
}
return 0;
}
This page took
0.026524 seconds
and
5
git commands to generate.