X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=52139d50de7198ac6524862554a4c9a4d892fa31;hb=d22ad5f818289bb10faa814c2ecef071ec0c2c67;hp=dcb7ca8639fd67ddac916ea84816e24e0b2b2b5e;hpb=a0377dfefe40662ba7d68617bce6ff467114136c;p=lttng-tools.git

diff --git a/src/common/optional.h b/src/common/optional.h
index dcb7ca863..52139d50d 100644
--- a/src/common/optional.h
+++ b/src/common/optional.h
@@ -24,7 +24,7 @@
  * Declaration example:
  * struct my_struct {
  * 	int a;
- * 	LTTNG_OPTIONAL(int, b);
+ * 	LTTNG_OPTIONAL(int) b;
  * };
  *
  * Usage example:
@@ -88,13 +88,13 @@
 /*
  * 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. */