goto error_destroy;
}
- writer->trace_dir_fd = open(path, O_RDONLY | O_DIRECTORY,
- S_IRWXU | S_IRWXG);
+ writer->trace_dir_fd = open(path, O_RDONLY, S_IRWXU | S_IRWXG);
if (writer->trace_dir_fd < 0) {
perror("open");
goto error_destroy;
}
static
-void append_trace_metadata(struct bt_ctf_writer *writer,
+int append_trace_metadata(struct bt_ctf_writer *writer,
struct metadata_context *context)
{
unsigned char *uuid = writer->uuid;
g_string_assign(context->field_name, "");
ret = bt_ctf_field_type_serialize(writer->trace_packet_header_type,
context);
- assert(!ret);
+ if (ret) {
+ goto end;
+ }
context->current_indentation_level--;
g_string_append(context->string, ";\n};\n\n");
+end:
+ return ret;
}
static
context->field_name = g_string_sized_new(DEFAULT_IDENTIFIER_SIZE);
context->string = g_string_sized_new(DEFAULT_METADATA_STRING_SIZE);
g_string_append(context->string, "/* CTF 1.8 */\n\n");
- append_trace_metadata(writer, context);
+ if (append_trace_metadata(writer, context)) {
+ goto error;
+ }
append_env_metadata(writer, context);
g_ptr_array_foreach(writer->clocks,
(GFunc)bt_ctf_clock_serialize, context);
token = strtok_r(string, " ", &save_ptr);
while (token) {
- if (g_hash_table_contains(reserved_keywords_set,
- GINT_TO_POINTER(g_quark_from_string(token)))) {
+ if (g_hash_table_lookup_extended(reserved_keywords_set,
+ GINT_TO_POINTER(g_quark_from_string(token)),
+ NULL, NULL)) {
ret = -1;
goto end;
}
reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
for (i = 0; i < reserved_keywords_count; i++) {
- g_hash_table_add(reserved_keywords_set,
- GINT_TO_POINTER(g_quark_from_string(reserved_keywords_str[i])));
+ gpointer quark = GINT_TO_POINTER(g_quark_from_string(
+ reserved_keywords_str[i]));
+
+ g_hash_table_insert(reserved_keywords_set, quark, quark);
}
init_done = 1;