Standardize `!ptr` i/o `ptr == NULL`, `ptr` i/o `ptr != NULL`

[babeltrace.git] / src / ctf-writer / fields.h

diff --git a/src/ctf-writer/fields.h b/src/ctf-writer/fields.h
index b1525e46ef3f7d11bf8093f697e7ca454b2d8560..ecf7e914c85e5994a0c18d1442b59be624d715be 100644 (file)
--- a/src/ctf-writer/fields.h
+++ b/src/ctf-writer/fields.h
@@ -35,10 +35,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <babeltrace2/ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/fields.h>
 #include <babeltrace2/types.h>
 
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "common/common.h"
 #include "ctfser/ctfser.h"
 
@@ -67,7 +67,7 @@ typedef void (*bt_ctf_field_common_method_set_is_frozen)(struct bt_ctf_field_com
 typedef int (*bt_ctf_field_common_method_validate)(struct bt_ctf_field_common *);
 typedef struct bt_ctf_field_common *(*bt_ctf_field_common_method_copy)(
                struct bt_ctf_field_common *);
-typedef bt_bool (*bt_ctf_field_common_method_is_set)(struct bt_ctf_field_common *);
+typedef bt_ctf_bool (*bt_ctf_field_common_method_is_set)(struct bt_ctf_field_common *);
 typedef void (*bt_ctf_field_common_method_reset)(struct bt_ctf_field_common *);
 
 struct bt_ctf_field_common_methods {
@@ -255,20 +255,20 @@ void _bt_ctf_field_common_set_is_frozen_recursive(struct bt_ctf_field_common *fi
                bool is_frozen);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_common_generic_is_set(struct bt_ctf_field_common *field);
+bt_ctf_bool bt_ctf_field_common_generic_is_set(struct bt_ctf_field_common *field);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_common_structure_is_set_recursive(
+bt_ctf_bool bt_ctf_field_common_structure_is_set_recursive(
                struct bt_ctf_field_common *field);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_common_variant_is_set_recursive(struct bt_ctf_field_common *field);
+bt_ctf_bool bt_ctf_field_common_variant_is_set_recursive(struct bt_ctf_field_common *field);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_common_array_is_set_recursive(struct bt_ctf_field_common *field);
+bt_ctf_bool bt_ctf_field_common_array_is_set_recursive(struct bt_ctf_field_common *field);
 
 BT_HIDDEN
-bt_bool bt_ctf_field_common_sequence_is_set_recursive(struct bt_ctf_field_common *field);
+bt_ctf_bool bt_ctf_field_common_sequence_is_set_recursive(struct bt_ctf_field_common *field);
 
 #ifdef BT_DEV_MODE
 # define bt_ctf_field_common_validate_recursive                _bt_ctf_field_common_validate_recursive
@@ -279,7 +279,7 @@ bt_bool bt_ctf_field_common_sequence_is_set_recursive(struct bt_ctf_field_common
 #else
 # define bt_ctf_field_common_validate_recursive(_field)        (-1)
 # define bt_ctf_field_common_set_is_frozen_recursive(_field, _is_frozen)
-# define bt_ctf_field_common_is_set_recursive(_field)  (BT_FALSE)
+# define bt_ctf_field_common_is_set_recursive(_field)  (BT_CTF_FALSE)
 # define bt_ctf_field_common_reset_recursive(_field)
 # define bt_ctf_field_common_set(_field, _val)
 #endif
@@ -329,9 +329,9 @@ void _bt_ctf_field_common_set(struct bt_ctf_field_common *field, bool value)
 }
 
 static inline
-bt_bool _bt_ctf_field_common_is_set_recursive(struct bt_ctf_field_common *field)
+bt_ctf_bool _bt_ctf_field_common_is_set_recursive(struct bt_ctf_field_common *field)
 {
-       bt_bool is_set = BT_FALSE;
+       bt_ctf_bool is_set = BT_CTF_FALSE;
 
        if (!field) {
                goto end;
@@ -393,7 +393,7 @@ int bt_ctf_field_common_sequence_set_length(struct bt_ctf_field_common *field,
                length);
        BT_CTF_ASSERT_PRE_CTF_FIELD_COMMON_HOT(field, "Sequence field");
 
-       if (unlikely(length > sequence->elements->len)) {
+       if (G_UNLIKELY(length > sequence->elements->len)) {
                /* Make more room */
                struct bt_ctf_field_type_common_sequence *sequence_ft;
                uint64_t cur_len = sequence->elements->len;
@@ -443,7 +443,7 @@ struct bt_ctf_field_common *bt_ctf_field_common_structure_borrow_field_by_name(
        if (!g_hash_table_lookup_extended(field_name_to_index,
                        GUINT_TO_POINTER(field_quark),
                        NULL, (gpointer *) &index)) {
-               BT_LOGV("Invalid parameter: no such field in structure field's type: "
+               BT_LOGT("Invalid parameter: no such field in structure field's type: "
                        "struct-field-addr=%p, struct-ft-addr=%p, name=\"%s\"",
                        field, field->type, name);
                goto error;
@@ -650,13 +650,13 @@ int bt_ctf_field_common_string_append_len(struct bt_ctf_field_common *field,
                BT_CTF_FIELD_TYPE_ID_STRING, "Field");
 
        /* Make sure no null bytes are appended */
-       BT_CTF_ASSERT_PRE(memchr(value, '\0', length) == NULL,
+       BT_CTF_ASSERT_PRE(!memchr(value, '\0', length),
                "String value to append contains a null character: "
                "partial-value=\"%.32s\", length=%u", value, length);
 
        new_size = string_field->size + length;
 
-       if (unlikely(new_size + 1 > string_field->buf->len)) {
+       if (G_UNLIKELY(new_size + 1 > string_field->buf->len)) {
                g_array_set_size(string_field->buf, new_size + 1);
        }
 
@@ -844,7 +844,7 @@ struct bt_ctf_field *bt_ctf_field_enumeration_borrow_container(
                struct bt_ctf_field *field);
 
 static inline
-bt_bool bt_ctf_field_is_set_recursive(struct bt_ctf_field *field)
+bt_ctf_bool bt_ctf_field_is_set_recursive(struct bt_ctf_field *field)
 {
        return bt_ctf_field_common_is_set_recursive((void *) field);
 }