From 71c7c95f0b9d976a66d3f74aacccd3d1537e6e05 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 12 Sep 2016 20:01:27 +0000 Subject: [PATCH] Port: Use glib portable macros to convert gpointer to int MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- cli/babeltrace.c | 4 ++-- plugins/ctf/common/metadata/parser.y | 2 +- plugins/ctf/common/metadata/visitor-generate-ir.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/babeltrace.c b/cli/babeltrace.c index 8e4755a6..66c74df4 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -1190,7 +1190,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( cfg_conn->downstream_comp_name->str); assert(downstreamp_comp_name_quark > 0); downstream_comp = g_hash_table_lookup(ctx->components, - (gpointer) (long) downstreamp_comp_name_quark); + GUINT_TO_POINTER(downstreamp_comp_name_quark)); if (!downstream_comp) { BT_LOGE("Cannot find downstream component: comp-name=\"%s\", " "conn-arg=\"%s\"", cfg_conn->downstream_comp_name->str, @@ -1596,7 +1596,7 @@ int cmd_run_ctx_create_components_from_config_components( quark = g_quark_from_string(cfg_comp->instance_name->str); assert(quark > 0); g_hash_table_insert(ctx->components, - (gpointer) (long) quark, comp); + GUINT_TO_POINTER(quark), comp); comp = NULL; BT_PUT(comp_cls); } diff --git a/plugins/ctf/common/metadata/parser.y b/plugins/ctf/common/metadata/parser.y index eb9c7554..24cc902a 100644 --- a/plugins/ctf/common/metadata/parser.y +++ b/plugins/ctf/common/metadata/parser.y @@ -330,7 +330,7 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id) { int ret; - ret = (int) (long) g_hash_table_lookup(s->types, id); + ret = GPOINTER_TO_INT(g_hash_table_lookup(s->types, id)); printf_debug("lookup %p %s %d\n", s, id, ret); return ret; } diff --git a/plugins/ctf/common/metadata/visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c index aa707548..6fefc24d 100644 --- a/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -384,7 +384,7 @@ struct bt_ctf_field_type *ctx_decl_scope_lookup_prefix_alias( while (cur_scope && cur_levels < levels) { decl = g_hash_table_lookup(cur_scope->decl_map, - (gconstpointer) (unsigned long) qname); + (gconstpointer) GUINT_TO_POINTER(qname)); if (decl) { /* Caller's reference */ bt_get(decl); @@ -500,7 +500,7 @@ int ctx_decl_scope_register_prefix_alias(struct ctx_decl_scope *scope, } g_hash_table_insert(scope->decl_map, - (gpointer) (unsigned long) qname, decl); + GUINT_TO_POINTER(qname), decl); /* Hash table's reference */ bt_get(decl); -- 2.34.1