Update licensing info

[lttng-modules.git] / ltt-events.c

diff --git a/ltt-events.c b/ltt-events.c
index 7c08def9d2d4d8935bd5393e832fcdea3ff83a30..ffcc61ec65d5657fb03a0e0ca7958cb1df43f60f 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng per-session event registry.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>
@@ -470,31 +472,34 @@ int _ltt_field_statedump(struct ltt_session *session,
                length_type = &field->type.u.sequence.length_type;
                ret = lttng_metadata_printf(session,
                        "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } __%s_length;\n",
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n",
                        length_type->u.basic.integer.size,
-                       length_type->u.basic.integer.alignment,
+                       (unsigned int) length_type->u.basic.integer.alignment,
                        length_type->u.basic.integer.signedness,
                        (length_type->u.basic.integer.encoding == lttng_encode_none)
                                ? "none"
-                               : (length_type->u.basic.integer.encoding == lttng_encode_UTF8)
+                               : ((length_type->u.basic.integer.encoding == lttng_encode_UTF8)
                                        ? "UTF8"
-                                       : "ASCII",
+                                       : "ASCII"),
                        length_type->u.basic.integer.base,
 #ifdef __BIG_ENDIAN
                        length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
-                       length_type->u.basic.integer.reverse_byte_order
-? " byte_order = be;" : "",
+                       length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
 #endif
-                       field->name,
+                       field->name);
+               if (ret)
+                       return ret;
+
+               ret = lttng_metadata_printf(session,
+                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n",
                        elem_type->u.basic.integer.size,
-                       elem_type->u.basic.integer.alignment,
+                       (unsigned int) elem_type->u.basic.integer.alignment,
                        elem_type->u.basic.integer.signedness,
                        (elem_type->u.basic.integer.encoding == lttng_encode_none)
                                ? "none"
-                               : (elem_type->u.basic.integer.encoding == lttng_encode_UTF8)
+                               : ((elem_type->u.basic.integer.encoding == lttng_encode_UTF8)
                                        ? "UTF8"
-                                       : "ASCII",
+                                       : "ASCII"),
                        elem_type->u.basic.integer.base,
 #ifdef __BIG_ENDIAN
                        elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
@@ -502,8 +507,7 @@ int _ltt_field_statedump(struct ltt_session *session,
                        elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
 #endif
                        field->name,
-                       field->name
-                       );
+                       field->name);
                break;
        }
 
@@ -860,9 +864,6 @@ static int __init ltt_events_init(void)
 {
        int ret;
 
-       ret = wrapper_task_prio_init();
-       if (ret)
-               return ret;
        event_cache = KMEM_CACHE(ltt_event, 0);
        if (!event_cache)
                return -ENOMEM;