X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=f34c5991fdfd4be070a1362d1968c4b3b88d2526;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=ca7d1f043d21bdef1b9ad8dc716452ee49fe7858;hpb=5747e45ab31cb9ad87fe17c7d4de0faf3324812b;p=lttng-tools.git

diff --git a/src/common/optional.h b/src/common/optional.h
index ca7d1f043..f34c5991f 100644
--- a/src/common/optional.h
+++ b/src/common/optional.h
@@ -9,7 +9,6 @@
 #define LTTNG_OPTIONAL_H
 
 #include <stdint.h>
-#include <assert.h>
 
 /*
  * Define wrapper structure representing an optional value.
@@ -25,7 +24,7 @@
  * Declaration example:
  * struct my_struct {
  * 	int a;
- * 	LTTNG_OPTIONAL(int, b);
+ * 	LTTNG_OPTIONAL(int) b;
  * };
  *
  * Usage example:
@@ -56,25 +55,25 @@
 
 /*
  * This macro is available as a 'convenience' to allow sites that assume
- * an optional value is set to assert() that it is set when accessing it.
+ * an optional value is set to LTTNG_ASSERT() that it is set when accessing it.
  *
  * Since this returns the 'optional' by value, it is not suitable for all
  * wrapped optional types. It is meant to be used with PODs.
  */
 #define LTTNG_OPTIONAL_GET(optional)			\
 	({						\
-		assert((optional).is_set);		\
+		LTTNG_ASSERT((optional).is_set);		\
 		(optional).value;			\
 	})
 
 /*
  * This macro is available as a 'convenience' to allow sites that assume
- * an optional value is set to assert() that it is set when fecthing the
+ * an optional value is set to LTTNG_ASSERT() that it is set when fecthing the
  * underlying value's address.
  */
 #define LTTNG_OPTIONAL_GET_PTR(optional)			\
 	({						\
-		assert((optional).is_set);		\
+		LTTNG_ASSERT((optional).is_set);		\
 		&(optional).value;			\
 	})
 
@@ -84,18 +83,18 @@
  * The wrapped field is set to the value it would gave if it had static storage
  * duration.
  */
-#define LTTNG_OPTIONAL_INIT_UNSET { .is_set = 0 }
+#define LTTNG_OPTIONAL_INIT_UNSET {}
 
 /*
  * Initialize an optional field as 'set' with a given value.
  */
-#define LTTNG_OPTIONAL_INIT_VALUE(val) { .value = val, .is_set = 1 }
+#define LTTNG_OPTIONAL_INIT_VALUE(val) { .is_set = 1, .value = val }
 
 /* Set the value of an optional field. */
 #define LTTNG_OPTIONAL_SET(field_ptr, val)	\
 	do {					\
-		(field_ptr)->value = (val);	\
 		(field_ptr)->is_set = 1;	\
+		(field_ptr)->value = (val);	\
 	} while (0)
 
 /* Put an optional field in the "unset" (NULL-ed) state. */