projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: optional.h macro missing parentheses and guards
[lttng-tools.git]
/
src
/
common
/
optional.h
diff --git
a/src/common/optional.h
b/src/common/optional.h
index aee5fcc5ec911d9d17e97218632767348f827cb8..53215b0315e299695e03ec67dc49890176707cd4 100644
(file)
--- a/
src/common/optional.h
+++ b/
src/common/optional.h
@@
-73,8
+73,8
@@
*/
#define LTTNG_OPTIONAL_GET(optional) \
({ \
*/
#define LTTNG_OPTIONAL_GET(optional) \
({ \
- assert(
optional.is_set);
\
-
optional.value;
\
+ assert(
(optional).is_set);
\
+
(optional).value;
\
})
/*
})
/*
@@
-86,12
+86,16
@@
#define LTTNG_OPTIONAL_INIT { .is_set = 0 }
/* Set the value of an optional field. */
#define LTTNG_OPTIONAL_INIT { .is_set = 0 }
/* Set the value of an optional field. */
-#define LTTNG_OPTIONAL_SET(field_ptr, val) \
- (field_ptr)->value = val; \
- (field_ptr)->is_set = 1;
+#define LTTNG_OPTIONAL_SET(field_ptr, val) \
+ do { \
+ (field_ptr)->value = (val); \
+ (field_ptr)->is_set = 1; \
+ } while (0)
/* Put an optional field in the "unset" (NULL-ed) state. */
/* Put an optional field in the "unset" (NULL-ed) state. */
-#define LTTNG_OPTIONAL_UNSET(field_ptr) \
- (field_ptr)->is_set = 0;
+#define LTTNG_OPTIONAL_UNSET(field_ptr) \
+ do { \
+ (field_ptr)->is_set = 0; \
+ } while (0)
#endif /* LTTNG_OPTIONAL_H */
#endif /* LTTNG_OPTIONAL_H */
This page took
0.023238 seconds
and
4
git commands to generate.