X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-probes.c;h=d518a41d2b66cc5e439c687f8b83fd6350c807d4;hb=8c3470eaadb6e01fe65e1b852907467c0527ba05;hp=e328e2c0f34ddf3219ccdae1e680f659d596301e;hpb=d8d2416dab454962b90222ba46c82cdce0c666a4;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index e328e2c0..d518a41d 100644
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -1,23 +1,9 @@
 /*
- * lttng-probes.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Holds LTTng probes registry.
- *
- * Copyright 2010-2012 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Copyright 2010-2012 (C) Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Holds LTTng probes registry.
  */
 
 #define _LGPL_SOURCE
@@ -29,7 +15,7 @@
 #include <lttng/tracepoint.h>
 #include "tracepoint-internal.h"
 #include <assert.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <ctype.h>
 
 #include "lttng-tracer-core.h"
@@ -211,12 +197,6 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
 	return ret;
 }
 
-/* Backward compatibility with UST 2.0 */
-int ltt_probe_register(struct lttng_probe_desc *desc)
-{
-	return lttng_probe_register(desc);
-}
-
 void lttng_probe_unregister(struct lttng_probe_desc *desc)
 {
 	lttng_ust_fixup_tls();
@@ -236,12 +216,6 @@ void lttng_probe_unregister(struct lttng_probe_desc *desc)
 	ust_unlock();
 }
 
-/* Backward compatibility with UST 2.0 */
-void ltt_probe_unregister(struct lttng_probe_desc *desc)
-{
-	lttng_probe_unregister(desc);
-}
-
 void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list)
 {
 	struct tp_list_entry *list_entry, *tmp;
@@ -387,13 +361,6 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 				case atype_string:
 					list_entry->field.type = LTTNG_UST_FIELD_STRING;
 					break;
-				case atype_array:
-					if (event_field->type.u.legacy.array.elem_type.atype != atype_integer
-						|| event_field->type.u.legacy.array.elem_type.u.basic.integer.encoding == lttng_encode_none)
-						list_entry->field.type = LTTNG_UST_FIELD_OTHER;
-					else
-						list_entry->field.type = LTTNG_UST_FIELD_STRING;
-					break;
 				case atype_array_nestable:
 					if (event_field->type.u.array_nestable.elem_type->atype != atype_integer
 						|| event_field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none)
@@ -401,13 +368,6 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 					else
 						list_entry->field.type = LTTNG_UST_FIELD_STRING;
 					break;
-				case atype_sequence:
-					if (event_field->type.u.legacy.sequence.elem_type.atype != atype_integer
-						|| event_field->type.u.legacy.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none)
-						list_entry->field.type = LTTNG_UST_FIELD_OTHER;
-					else
-						list_entry->field.type = LTTNG_UST_FIELD_STRING;
-					break;
 				case atype_sequence_nestable:
 					if (event_field->type.u.sequence_nestable.elem_type->atype != atype_integer
 						|| event_field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none)
@@ -418,7 +378,6 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 				case atype_float:
 					list_entry->field.type = LTTNG_UST_FIELD_FLOAT;
 					break;
-				case atype_enum:	/* Fall-through */
 				case atype_enum_nestable:
 					list_entry->field.type = LTTNG_UST_FIELD_ENUM;
 					break;