#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRANSLATE-TRACE-IR-TO-CTF-IR"
#include "logging.h"
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/assert-internal.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
* sequence field class.
*/
static
-int set_field_refs(struct fs_sink_ctf_field_class *fc, const char *fc_name,
- struct fs_sink_ctf_field_class *parent_fc)
+int set_field_refs(struct fs_sink_ctf_field_class * const fc,
+ const char *fc_name, struct fs_sink_ctf_field_class *parent_fc)
{
int ret = 0;
+ enum fs_sink_ctf_field_class_type fc_type;
BT_ASSERT(fc);
- switch (fc->type) {
+ fc_type = fc->type;
+
+ switch (fc_type) {
case FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT:
case FS_SINK_CTF_FIELD_CLASS_TYPE_VARIANT:
{
uint64_t i;
uint64_t len;
struct fs_sink_ctf_field_class_struct *struct_fc;
- struct fs_sink_ctf_field_class_variant *var_fc;
+ struct fs_sink_ctf_field_class_variant *var_fc = NULL;
struct fs_sink_ctf_named_field_class *named_fc;
- if (fc->type == FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT) {
+ if (fc_type == FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT) {
struct_fc = (void *) fc;
len = struct_fc->members->len;
} else {
}
for (i = 0; i < len; i++) {
- if (fc->type == FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT) {
+ if (fc_type == FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT) {
named_fc = fs_sink_ctf_field_class_struct_borrow_member_by_index(
struct_fc, i);
} else {
struct fs_sink_ctf_field_class_array_base *array_base_fc =
(void *) fc;
- if (fc->type == FS_SINK_CTF_FIELD_CLASS_TYPE_SEQUENCE) {
+ if (fc_type == FS_SINK_CTF_FIELD_CLASS_TYPE_SEQUENCE) {
ret = set_field_ref(fc, fc_name, parent_fc);
if (ret) {
goto end;
const char *name = bt_clock_class_get_name(
(*out_sc)->default_clock_class);
- if (!bt_stream_class_default_clock_is_always_known(ir_sc)) {
- BT_LOGE("Unsupported stream clock which can have an unknown value: "
- "sc-name=\"%s\"",
- bt_stream_class_get_name(ir_sc));
- goto error;
- }
-
if (name) {
/* Try original name, protected */
g_string_assign((*out_sc)->default_clock_class_name,
}
switch (bt_value_get_type(val)) {
- case BT_VALUE_TYPE_INTEGER:
+ case BT_VALUE_TYPE_SIGNED_INTEGER:
case BT_VALUE_TYPE_STRING:
break;
default: