X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=0d99fe3224f4e419679d22627a0f4899f0c2a9d2;hp=53215b0315e299695e03ec67dc49890176707cd4;hb=3da864a94ccc39239fea82c4803b58b6b56a1003;hpb=bc2dc8d464c34ad5a51ed46e46c6fc98a5bbf3fd

diff --git a/src/common/optional.h b/src/common/optional.h
index 53215b031..0d99fe322 100644
--- a/src/common/optional.h
+++ b/src/common/optional.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef LTTNG_OPTIONAL_H
@@ -77,6 +67,17 @@
 		(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
+ * underlying value's address.
+ */
+#define LTTNG_OPTIONAL_GET_PTR(optional)			\
+	({						\
+		assert((optional).is_set);		\
+		&(optional).value;			\
+	})
+
 /*
  * Initialize an optional field.
  *