Clean-up: sessiond: cmd_enable_channel_internal

[lttng-tools.git] / src / common / optional.h

diff --git a/src/common/optional.h b/src/common/optional.h
index dcb7ca8639fd67ddac916ea84816e24e0b2b2b5e..f34c5991fdfd4be070a1362d1968c4b3b88d2526 100644 (file)
--- 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:
@@ -83,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. */