Standardize `!ptr` i/o `ptr == NULL`, `ptr` i/o `ptr != NULL`
[babeltrace.git] / src / plugins / ctf / common / metadata / visitor-generate-ir.c
index d52104f8841d44ec50b06c291b0ae4dc05777bb2..26e11290c60a1080b95cdff21e14daa94a89d93f 100644 (file)
@@ -43,7 +43,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include "common/common.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include "compat/endian.h"
 #include <babeltrace2/babeltrace.h>
 
@@ -679,61 +679,6 @@ static
 int visit_field_class_specifier_list(struct ctx *ctx, struct ctf_node *ts_list,
                struct ctf_field_class **decl);
 
-static
-char *remove_underscores_from_field_ref(struct ctx *ctx, const char *field_ref)
-{
-       const char *in_ch;
-       char *out_ch;
-       char *ret;
-       enum {
-               UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE,
-               UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE,
-       } state = UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE;
-
-       BT_ASSERT(field_ref);
-       ret = calloc(strlen(field_ref) + 1, 1);
-       if (!ret) {
-               BT_COMP_LOGE("Failed to allocate a string: size=%zu",
-                       strlen(field_ref) + 1);
-               goto end;
-       }
-
-       in_ch = field_ref;
-       out_ch = ret;
-
-       while (*in_ch != '\0') {
-               switch (*in_ch) {
-               case ' ':
-               case '\t':
-                       /* Remove whitespace */
-                       in_ch++;
-                       continue;
-               case '_':
-                       if (state == UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE) {
-                               in_ch++;
-                               state = UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE;
-                               continue;
-                       }
-
-                       goto copy;
-               case '.':
-                       state = UNDERSCORE_REMOVE_STATE_REMOVE_NEXT_UNDERSCORE;
-                       goto copy;
-               default:
-                       state = UNDERSCORE_REMOVE_STATE_DO_NOT_REMOVE_NEXT_UNDERSCORE;
-                       goto copy;
-               }
-
-copy:
-               *out_ch = *in_ch;
-               in_ch++;
-               out_ch++;
-       }
-
-end:
-       return ret;
-}
-
 static
 int is_unary_string(struct bt_list_head *head)
 {
@@ -979,7 +924,7 @@ end:
 
 static
 int get_unary_uuid(struct ctx *ctx, struct bt_list_head *head,
-               unsigned char *uuid)
+               uint8_t *uuid)
 {
        int i = 0;
        int ret = 0;
@@ -999,7 +944,7 @@ int get_unary_uuid(struct ctx *ctx, struct bt_list_head *head,
                }
 
                src_string = node->u.unary_expression.u.string;
-               ret = bt_uuid_parse(src_string, uuid);
+               ret = bt_uuid_from_str(src_string, uuid);
                if (ret) {
                        _BT_COMP_LOGE_NODE(node,
                                "Cannot parse UUID: uuid=\"%s\"", src_string);
@@ -1035,9 +980,9 @@ int get_boolean(struct ctx *ctx, struct ctf_node *unary_expr)
        {
                const char *str = unary_expr->u.unary_expression.u.string;
 
-               if (!strcmp(str, "true") || !strcmp(str, "TRUE")) {
+               if (strcmp(str, "true") == 0 || strcmp(str, "TRUE") == 0) {
                        ret = TRUE;
-               } else if (!strcmp(str, "false") || !strcmp(str, "FALSE")) {
+               } else if (strcmp(str, "false") == 0 || strcmp(str, "FALSE") == 0) {
                        ret = FALSE;
                } else {
                        _BT_COMP_LOGE_NODE(unary_expr,
@@ -1074,11 +1019,11 @@ enum ctf_byte_order byte_order_from_unary_expr(struct ctx *ctx,
 
        str = unary_expr->u.unary_expression.u.string;
 
-       if (!strcmp(str, "be") || !strcmp(str, "network")) {
+       if (strcmp(str, "be") == 0 || strcmp(str, "network") == 0) {
                bo = CTF_BYTE_ORDER_BIG;
-       } else if (!strcmp(str, "le")) {
+       } else if (strcmp(str, "le") == 0) {
                bo = CTF_BYTE_ORDER_LITTLE;
-       } else if (!strcmp(str, "native")) {
+       } else if (strcmp(str, "native") == 0) {
                bo = CTF_BYTE_ORDER_DEFAULT;
        } else {
                _BT_COMP_LOGE_NODE(unary_expr,
@@ -1385,10 +1330,6 @@ int visit_field_class_declarator(struct ctx *ctx,
                        const char *id =
                                node_field_class_declarator->u.field_class_declarator.u.id;
 
-                       if (id[0] == '_') {
-                               id++;
-                       }
-
                        *field_name = g_quark_from_string(id);
                } else {
                        *field_name = 0;
@@ -1493,24 +1434,12 @@ int visit_field_class_declarator(struct ctx *ctx,
                                nested_decl = NULL;
                                decl = (void *) array_decl;
                        } else {
-                               char *length_name_no_underscore =
-                                       remove_underscores_from_field_ref(ctx,
-                                               length_name);
-                               if (!length_name_no_underscore) {
-                                       /*
-                                        * remove_underscores_from_field_ref()
-                                        * logs errors
-                                        */
-                                       ret = -EINVAL;
-                                       goto error;
-                               }
                                seq_decl = ctf_field_class_sequence_create();
                                BT_ASSERT(seq_decl);
                                seq_decl->base.elem_fc = nested_decl;
                                nested_decl = NULL;
                                g_string_assign(seq_decl->length_ref,
-                                       length_name_no_underscore);
-                               free(length_name_no_underscore);
+                                       length_name);
                                decl = (void *) seq_decl;
                        }
 
@@ -2067,17 +1996,7 @@ int visit_variant_decl(struct ctx *ctx, const char *name,
                 * At this point, we have a fresh untagged variant; nobody
                 * else owns it. Set its tag now.
                 */
-               char *tag_no_underscore =
-                       remove_underscores_from_field_ref(ctx, tag);
-
-               if (!tag_no_underscore) {
-                       /* remove_underscores_from_field_ref() logs errors */
-                       goto error;
-               }
-
-               g_string_assign(untagged_variant_decl->tag_ref,
-                       tag_no_underscore);
-               free(tag_no_underscore);
+               g_string_assign(untagged_variant_decl->tag_ref, tag);
                *variant_decl = untagged_variant_decl;
                untagged_variant_decl = NULL;
        }
@@ -2118,7 +2037,6 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator,
                .value.u = 0,
        };
        const char *label = enumerator->u.enumerator.id;
-       const char *effective_label = label;
        struct bt_list_head *values = &enumerator->u.enumerator.values;
 
        bt_list_for_each_entry(iter, values, siblings) {
@@ -2185,19 +2103,7 @@ int visit_enum_decl_entry(struct ctx *ctx, struct ctf_node *enumerator,
                last->value.u = end.value.u + 1;
        }
 
-       if (label[0] == '_') {
-               /*
-                * Strip the first underscore of any enumeration field
-                * class's label in case this enumeration FC is used as
-                * a variant FC tag later. The variant FC choice names
-                * could also start with `_`, in which case the prefix
-                * is removed, and it the resulting choice name needs to
-                * match tag labels.
-                */
-               effective_label = &label[1];
-       }
-
-       ctf_field_class_enum_append_mapping(enum_decl, effective_label,
+       ctf_field_class_enum_map_range(enum_decl, label,
                start.value.u, end.value.u);
        return 0;
 
@@ -2396,7 +2302,7 @@ int visit_integer_decl(struct ctx *ctx,
                        goto error;
                }
 
-               if (!strcmp(left->u.unary_expression.u.string, "signed")) {
+               if (strcmp(left->u.unary_expression.u.string, "signed") == 0) {
                        if (_IS_SET(&set, _INTEGER_SIGNED_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "signed",
                                        "integer field class");
@@ -2414,8 +2320,7 @@ int visit_integer_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _INTEGER_SIGNED_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "byte_order")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "byte_order") == 0) {
                        if (_IS_SET(&set, _INTEGER_BYTE_ORDER_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "byte_order",
                                        "integer field class");
@@ -2433,7 +2338,7 @@ int visit_integer_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _INTEGER_BYTE_ORDER_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string, "size")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "size") == 0) {
                        if (_IS_SET(&set, _INTEGER_SIZE_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "size",
                                        "integer field class");
@@ -2470,8 +2375,7 @@ int visit_integer_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _INTEGER_SIZE_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "align")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "align") == 0) {
                        if (_IS_SET(&set, _INTEGER_ALIGN_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "align",
                                        "integer field class");
@@ -2502,7 +2406,7 @@ int visit_integer_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _INTEGER_ALIGN_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string, "base")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "base") == 0) {
                        if (_IS_SET(&set, _INTEGER_BASE_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "base",
                                        "integer field class");
@@ -2550,24 +2454,24 @@ int visit_integer_decl(struct ctx *ctx,
                                        goto error;
                                }
 
-                               if (!strcmp(s_right, "decimal") ||
-                                               !strcmp(s_right, "dec") ||
-                                               !strcmp(s_right, "d") ||
-                                               !strcmp(s_right, "i") ||
-                                               !strcmp(s_right, "u")) {
+                               if (strcmp(s_right, "decimal") == 0 ||
+                                               strcmp(s_right, "dec") == 0 ||
+                                               strcmp(s_right, "d") == 0 ||
+                                               strcmp(s_right, "i") == 0 ||
+                                               strcmp(s_right, "u") == 0) {
                                        base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL;
-                               } else if (!strcmp(s_right, "hexadecimal") ||
-                                               !strcmp(s_right, "hex") ||
-                                               !strcmp(s_right, "x") ||
-                                               !strcmp(s_right, "X") ||
-                                               !strcmp(s_right, "p")) {
+                               } else if (strcmp(s_right, "hexadecimal") == 0 ||
+                                               strcmp(s_right, "hex") == 0 ||
+                                               strcmp(s_right, "x") == 0 ||
+                                               strcmp(s_right, "X") == 0 ||
+                                               strcmp(s_right, "p") == 0) {
                                        base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL;
-                               } else if (!strcmp(s_right, "octal") ||
-                                               !strcmp(s_right, "oct") ||
-                                               !strcmp(s_right, "o")) {
+                               } else if (strcmp(s_right, "octal") == 0 ||
+                                               strcmp(s_right, "oct") == 0 ||
+                                               strcmp(s_right, "o") == 0) {
                                        base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL;
-                               } else if (!strcmp(s_right, "binary") ||
-                                               !strcmp(s_right, "b")) {
+                               } else if (strcmp(s_right, "binary") == 0 ||
+                                               strcmp(s_right, "b") == 0) {
                                        base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY;
                                } else {
                                        _BT_COMP_LOGE_NODE(right,
@@ -2590,8 +2494,7 @@ int visit_integer_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _INTEGER_BASE_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "encoding")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "encoding") == 0) {
                        char *s_right;
 
                        if (_IS_SET(&set, _INTEGER_ENCODING_SET)) {
@@ -2618,14 +2521,14 @@ int visit_integer_decl(struct ctx *ctx,
                                goto error;
                        }
 
-                       if (!strcmp(s_right, "UTF8") ||
-                                       !strcmp(s_right, "utf8") ||
-                                       !strcmp(s_right, "utf-8") ||
-                                       !strcmp(s_right, "UTF-8") ||
-                                       !strcmp(s_right, "ASCII") ||
-                                       !strcmp(s_right, "ascii")) {
+                       if (strcmp(s_right, "UTF8") == 0 ||
+                                       strcmp(s_right, "utf8") == 0 ||
+                                       strcmp(s_right, "utf-8") == 0 ||
+                                       strcmp(s_right, "UTF-8") == 0 ||
+                                       strcmp(s_right, "ASCII") == 0 ||
+                                       strcmp(s_right, "ascii") == 0) {
                                encoding = CTF_ENCODING_UTF8;
-                       } else if (!strcmp(s_right, "none")) {
+                       } else if (strcmp(s_right, "none") == 0) {
                                encoding = CTF_ENCODING_NONE;
                        } else {
                                _BT_COMP_LOGE_NODE(right,
@@ -2639,7 +2542,7 @@ int visit_integer_decl(struct ctx *ctx,
 
                        g_free(s_right);
                        _SET(&set, _INTEGER_ENCODING_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string, "map")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "map") == 0) {
                        const char *clock_name;
 
                        if (_IS_SET(&set, _INTEGER_MAP_SET)) {
@@ -2764,7 +2667,7 @@ int visit_floating_point_number_decl(struct ctx *ctx,
                        goto error;
                }
 
-               if (!strcmp(left->u.unary_expression.u.string, "byte_order")) {
+               if (strcmp(left->u.unary_expression.u.string, "byte_order") == 0) {
                        if (_IS_SET(&set, _FLOAT_BYTE_ORDER_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "byte_order",
                                        "floating point number field class");
@@ -2782,8 +2685,7 @@ int visit_floating_point_number_decl(struct ctx *ctx,
                        }
 
                        _SET(&set, _FLOAT_BYTE_ORDER_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "exp_dig")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "exp_dig") == 0) {
                        if (_IS_SET(&set, _FLOAT_EXP_DIG_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "exp_dig",
                                        "floating point number field class");
@@ -2804,8 +2706,7 @@ int visit_floating_point_number_decl(struct ctx *ctx,
 
                        exp_dig = right->u.unary_expression.u.unsigned_constant;
                        _SET(&set, _FLOAT_EXP_DIG_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "mant_dig")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "mant_dig") == 0) {
                        if (_IS_SET(&set, _FLOAT_MANT_DIG_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "mant_dig",
                                        "floating point number field class");
@@ -2827,8 +2728,7 @@ int visit_floating_point_number_decl(struct ctx *ctx,
                        mant_dig = right->u.unary_expression.u.
                                unsigned_constant;
                        _SET(&set, _FLOAT_MANT_DIG_SET);
-               } else if (!strcmp(left->u.unary_expression.u.string,
-                               "align")) {
+               } else if (strcmp(left->u.unary_expression.u.string, "align") == 0) {
                        if (_IS_SET(&set, _FLOAT_ALIGN_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(left, "align",
                                        "floating point number field class");
@@ -2950,7 +2850,7 @@ int visit_string_decl(struct ctx *ctx,
                        goto error;
                }
 
-               if (!strcmp(left->u.unary_expression.u.string, "encoding")) {
+               if (strcmp(left->u.unary_expression.u.string, "encoding") == 0) {
                        char *s_right;
 
                        if (_IS_SET(&set, _STRING_ENCODING_SET)) {
@@ -2977,14 +2877,14 @@ int visit_string_decl(struct ctx *ctx,
                                goto error;
                        }
 
-                       if (!strcmp(s_right, "UTF8") ||
-                                       !strcmp(s_right, "utf8") ||
-                                       !strcmp(s_right, "utf-8") ||
-                                       !strcmp(s_right, "UTF-8") ||
-                                       !strcmp(s_right, "ASCII") ||
-                                       !strcmp(s_right, "ascii")) {
+                       if (strcmp(s_right, "UTF8") == 0 ||
+                                       strcmp(s_right, "utf8") == 0 ||
+                                       strcmp(s_right, "utf-8") == 0 ||
+                                       strcmp(s_right, "UTF-8") == 0 ||
+                                       strcmp(s_right, "ASCII") == 0 ||
+                                       strcmp(s_right, "ascii") == 0) {
                                encoding = CTF_ENCODING_UTF8;
-                       } else if (!strcmp(s_right, "none")) {
+                       } else if (strcmp(s_right, "none") == 0) {
                                encoding = CTF_ENCODING_NONE;
                        } else {
                                _BT_COMP_LOGE_NODE(right,
@@ -3175,7 +3075,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        goto error;
                }
 
-               if (!strcmp(left, "name")) {
+               if (strcmp(left, "name") == 0) {
                        /* This is already known at this stage */
                        if (_IS_SET(set, _EVENT_NAME_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "name", "event class");
@@ -3184,7 +3084,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        }
 
                        _SET(set, _EVENT_NAME_SET);
-               } else if (!strcmp(left, "id")) {
+               } else if (strcmp(left, "id") == 0) {
                        int64_t id = -1;
 
                        if (_IS_SET(set, _EVENT_ID_SET)) {
@@ -3206,7 +3106,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
 
                        event_class->id = id;
                        _SET(set, _EVENT_ID_SET);
-               } else if (!strcmp(left, "stream_id")) {
+               } else if (strcmp(left, "stream_id") == 0) {
                        if (_IS_SET(set, _EVENT_STREAM_ID_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "stream_id",
                                        "event class");
@@ -3229,7 +3129,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        }
 
                        _SET(set, _EVENT_STREAM_ID_SET);
-               } else if (!strcmp(left, "context")) {
+               } else if (strcmp(left, "context") == 0) {
                        if (_IS_SET(set, _EVENT_CONTEXT_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `context` entry in event class.");
@@ -3250,7 +3150,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
 
                        BT_ASSERT(event_class->spec_context_fc);
                        _SET(set, _EVENT_CONTEXT_SET);
-               } else if (!strcmp(left, "fields")) {
+               } else if (strcmp(left, "fields") == 0) {
                        if (_IS_SET(set, _EVENT_FIELDS_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `fields` entry in event class.");
@@ -3271,7 +3171,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
 
                        BT_ASSERT(event_class->payload_fc);
                        _SET(set, _EVENT_FIELDS_SET);
-               } else if (!strcmp(left, "loglevel")) {
+               } else if (strcmp(left, "loglevel") == 0) {
                        uint64_t loglevel_value;
                        bt_event_class_log_level log_level = -1;
 
@@ -3347,7 +3247,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        }
 
                        _SET(set, _EVENT_LOG_LEVEL_SET);
-               } else if (!strcmp(left, "model.emf.uri")) {
+               } else if (strcmp(left, "model.emf.uri") == 0) {
                        char *right;
 
                        if (_IS_SET(set, _EVENT_MODEL_EMF_URI_SET)) {
@@ -3394,9 +3294,7 @@ int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
        goto end;
 
 error:
-       if (left) {
-               g_free(left);
-       }
+       g_free(left);
 
 end:
        return ret;
@@ -3422,7 +3320,7 @@ char *get_event_decl_name(struct ctx *ctx, struct ctf_node *node)
                        goto error;
                }
 
-               if (!strcmp(left, "name")) {
+               if (strcmp(left, "name") == 0) {
                        name = concatenate_unary_strings(
                                &iter->u.ctf_expression.right);
                        if (!name) {
@@ -3571,9 +3469,7 @@ end:
                ctx_pop_scope(ctx);
        }
 
-       if (event_name) {
-               g_free(event_name);
-       }
+       g_free(event_name);
 
        return ret;
 }
@@ -3737,7 +3633,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        goto error;
                }
 
-               if (!strcmp(left, "id")) {
+               if (strcmp(left, "id") == 0) {
                        int64_t id;
 
                        if (_IS_SET(set, _STREAM_ID_SET)) {
@@ -3770,7 +3666,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node,
 
                        stream_class->id = id;
                        _SET(set, _STREAM_ID_SET);
-               } else if (!strcmp(left, "event.header")) {
+               } else if (strcmp(left, "event.header") == 0) {
                        if (_IS_SET(set, _STREAM_EVENT_HEADER_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `event.header` entry in stream class.");
@@ -3799,7 +3695,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node,
                        }
 
                        _SET(set, _STREAM_EVENT_HEADER_SET);
-               } else if (!strcmp(left, "event.context")) {
+               } else if (strcmp(left, "event.context") == 0) {
                        if (_IS_SET(set, _STREAM_EVENT_CONTEXT_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `event.context` entry in stream class.");
@@ -3820,7 +3716,7 @@ int visit_stream_decl_entry(struct ctx *ctx, struct ctf_node *node,
 
                        BT_ASSERT(stream_class->event_common_context_fc);
                        _SET(set, _STREAM_EVENT_CONTEXT_SET);
-               } else if (!strcmp(left, "packet.context")) {
+               } else if (strcmp(left, "packet.context") == 0) {
                        if (_IS_SET(set, _STREAM_PACKET_CONTEXT_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `packet.context` entry in stream class.");
@@ -4013,7 +3909,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set)
                        goto error;
                }
 
-               if (!strcmp(left, "major")) {
+               if (strcmp(left, "major") == 0) {
                        if (_IS_SET(set, _TRACE_MAJOR_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "major", "trace");
                                ret = -EPERM;
@@ -4037,7 +3933,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set)
 
                        ctx->ctf_tc->major = val;
                        _SET(set, _TRACE_MAJOR_SET);
-               } else if (!strcmp(left, "minor")) {
+               } else if (strcmp(left, "minor") == 0) {
                        if (_IS_SET(set, _TRACE_MINOR_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "minor", "trace");
                                ret = -EPERM;
@@ -4061,7 +3957,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set)
 
                        ctx->ctf_tc->minor = val;
                        _SET(set, _TRACE_MINOR_SET);
-               } else if (!strcmp(left, "uuid")) {
+               } else if (strcmp(left, "uuid") == 0) {
                        if (_IS_SET(set, _TRACE_UUID_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "uuid", "trace");
                                ret = -EPERM;
@@ -4079,7 +3975,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set)
 
                        ctx->ctf_tc->is_uuid_set = true;
                        _SET(set, _TRACE_UUID_SET);
-               } else if (!strcmp(left, "byte_order")) {
+               } else if (strcmp(left, "byte_order") == 0) {
                        /* Default byte order is already known at this stage */
                        if (_IS_SET(set, _TRACE_BYTE_ORDER_SET)) {
                                _BT_COMP_LOGE_DUP_ATTR(node, "byte_order",
@@ -4090,7 +3986,7 @@ int visit_trace_decl_entry(struct ctx *ctx, struct ctf_node *node, int *set)
 
                        BT_ASSERT(ctx->ctf_tc->default_byte_order != -1);
                        _SET(set, _TRACE_BYTE_ORDER_SET);
-               } else if (!strcmp(left, "packet.header")) {
+               } else if (strcmp(left, "packet.header") == 0) {
                        if (_IS_SET(set, _TRACE_PACKET_HEADER_SET)) {
                                _BT_COMP_LOGE_NODE(node,
                                        "Duplicate `packet.header` entry in trace.");
@@ -4318,7 +4214,7 @@ int set_trace_byte_order(struct ctx *ctx, struct ctf_node *trace_node)
                                goto error;
                        }
 
-                       if (!strcmp(left, "byte_order")) {
+                       if (strcmp(left, "byte_order") == 0) {
                                enum ctf_byte_order bo;
 
                                if (_IS_SET(&set, _TRACE_BYTE_ORDER_SET)) {
@@ -4393,7 +4289,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                goto error;
        }
 
-       if (!strcmp(left, "name")) {
+       if (strcmp(left, "name") == 0) {
                char *right;
 
                if (_IS_SET(set, _CLOCK_NAME_SET)) {
@@ -4414,8 +4310,8 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                g_string_assign(clock->name, right);
                g_free(right);
                _SET(set, _CLOCK_NAME_SET);
-       } else if (!strcmp(left, "uuid")) {
-               uint8_t uuid[BABELTRACE_UUID_LEN];
+       } else if (strcmp(left, "uuid") == 0) {
+               bt_uuid_t uuid;
 
                if (_IS_SET(set, _CLOCK_UUID_SET)) {
                        _BT_COMP_LOGE_DUP_ATTR(entry_node, "uuid", "clock class");
@@ -4432,9 +4328,9 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                }
 
                clock->has_uuid = true;
-               memcpy(&clock->uuid[0], uuid, 16);
+               bt_uuid_copy(clock->uuid, uuid);
                _SET(set, _CLOCK_UUID_SET);
-       } else if (!strcmp(left, "description")) {
+       } else if (strcmp(left, "description") == 0) {
                char *right;
 
                if (_IS_SET(set, _CLOCK_DESCRIPTION_SET)) {
@@ -4456,7 +4352,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                g_string_assign(clock->description, right);
                g_free(right);
                _SET(set, _CLOCK_DESCRIPTION_SET);
-       } else if (!strcmp(left, "freq")) {
+       } else if (strcmp(left, "freq") == 0) {
                uint64_t freq = UINT64_C(-1);
 
                if (_IS_SET(set, _CLOCK_FREQ_SET)) {
@@ -4484,7 +4380,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
 
                clock->frequency = freq;
                _SET(set, _CLOCK_FREQ_SET);
-       } else if (!strcmp(left, "precision")) {
+       } else if (strcmp(left, "precision") == 0) {
                uint64_t precision;
 
                if (_IS_SET(set, _CLOCK_PRECISION_SET)) {
@@ -4505,7 +4401,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
 
                clock->precision = precision;
                _SET(set, _CLOCK_PRECISION_SET);
-       } else if (!strcmp(left, "offset_s")) {
+       } else if (strcmp(left, "offset_s") == 0) {
                if (_IS_SET(set, _CLOCK_OFFSET_S_SET)) {
                        _BT_COMP_LOGE_DUP_ATTR(entry_node, "offset_s",
                                "clock class");
@@ -4523,7 +4419,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                }
 
                _SET(set, _CLOCK_OFFSET_S_SET);
-       } else if (!strcmp(left, "offset")) {
+       } else if (strcmp(left, "offset") == 0) {
                if (_IS_SET(set, _CLOCK_OFFSET_SET)) {
                        _BT_COMP_LOGE_DUP_ATTR(entry_node, "offset", "clock class");
                        ret = -EPERM;
@@ -4540,7 +4436,7 @@ int visit_clock_decl_entry(struct ctx *ctx, struct ctf_node *entry_node,
                }
 
                _SET(set, _CLOCK_OFFSET_SET);
-       } else if (!strcmp(left, "absolute")) {
+       } else if (strcmp(left, "absolute") == 0) {
                struct ctf_node *right;
 
                if (_IS_SET(set, _CLOCK_ABSOLUTE_SET)) {
@@ -4914,7 +4810,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                BT_ASSERT(ctx->ctf_tc->default_byte_order == CTF_BYTE_ORDER_LITTLE ||
                        ctx->ctf_tc->default_byte_order == CTF_BYTE_ORDER_BIG);
                BT_ASSERT(ctx->current_scope &&
-                               ctx->current_scope->parent_scope == NULL);
+                               !ctx->current_scope->parent_scope);
 
                /* Environment */
                bt_list_for_each_entry(iter, &node->u.root.env, siblings) {
@@ -4928,7 +4824,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /*
                 * Visit clock blocks.
@@ -4944,7 +4840,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /*
                 * Visit root declarations next, as they can be used by any
@@ -4962,7 +4858,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /* Callsite blocks are not supported */
                bt_list_for_each_entry(iter, &node->u.root.callsite, siblings) {
@@ -4971,7 +4867,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /* Trace */
                bt_list_for_each_entry(iter, &node->u.root.trace, siblings) {
@@ -4985,7 +4881,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /* Streams */
                bt_list_for_each_entry(iter, &node->u.root.stream, siblings) {
@@ -4999,7 +4895,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
 
                /* Events */
                bt_list_for_each_entry(iter, &node->u.root.event, siblings) {
@@ -5013,7 +4909,7 @@ int ctf_visitor_generate_ir_visit_node(struct ctf_visitor_generate_ir *visitor,
                }
 
                BT_ASSERT(ctx->current_scope &&
-                       ctx->current_scope->parent_scope == NULL);
+                       !ctx->current_scope->parent_scope);
                break;
        }
        default:
This page took 0.039304 seconds and 4 git commands to generate.