Hash table usage fixes

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index db97dbc01dfa29dbd71a349d0fe108cb066ca431..a2919ee2c7ce036b353e1002c1c05aba2d11bc05 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1522,7 +1522,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
        stream = g_new0(struct ctf_stream, 1);
        stream->declaration_scope = new_declaration_scope(parent_declaration_scope);
        stream->events_by_id = g_ptr_array_new();
        stream = g_new0(struct ctf_stream, 1);
        stream->declaration_scope = new_declaration_scope(parent_declaration_scope);
        stream->events_by_id = g_ptr_array_new();

-       stream->event_quark_to_id = g_hash_table_new(g_int_hash, g_int_equal);
+       stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal);

        cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
                ret = ctf_stream_declaration_visit(fd, depth + 1, iter, stream, trace);
                if (ret)
        cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
                ret = ctf_stream_declaration_visit(fd, depth + 1, iter, stream, trace);
                if (ret)

diff --git a/types/enum.c b/types/enum.c
index 99f10b71be1b36ff220ae654a226e0440c2b911f..4c2d2b7795013237a633c3333a176d553f2f93f6 100644 (file)
--- a/types/enum.c
+++ b/types/enum.c
@@ -403,8 +403,8 @@ struct declaration_enum *
                                                            enum_val_free,
                                                            enum_range_set_free);
        CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
                                                            enum_val_free,
                                                            enum_range_set_free);
        CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);

-       enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_int_hash,
-                                                       g_int_equal,
+       enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
+                                                       g_direct_equal,

                                                        NULL, enum_range_set_free);
        declaration_ref(&integer_declaration->p);
        enum_declaration->integer_declaration = integer_declaration;
                                                        NULL, enum_range_set_free);
        declaration_ref(&integer_declaration->p);
        enum_declaration->integer_declaration = integer_declaration;