From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Desfossez Subject: [BABELTRACE PATCH] Namespace the lookup_enum function Date: Wed, 9 Jan 2013 14:48:13 -0500 Message-ID: <1357760893-11961-1-git-send-email-jdesfossez@efficios.com> References: <20130107211855.GB3678@Krystal> Return-path: In-Reply-To: <20130107211855.GB3678@Krystal> List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org To: teawater@gmail.com Cc: mathieu.desnoyers@efficios.com, lttng-dev@lists.lttng.org, gdb@sourceware.org, tromey@redhat.com, palves@redhat.com, Julien Desfossez List-Id: lttng-dev@lists.lttng.org This patch namespaces the lookup_enum function because it causes problem with the integration in gdb even though it is not exported. Hui, can you try this patch and confirm it solves the current problem ? After that we will continue the internal namespacing. Thanks, Julien --- formats/ctf/ctf.c | 2 +- include/babeltrace/types.h | 2 +- types/types.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 18a5601..a8f8408 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -431,7 +431,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream } else { struct definition_enum *enum_definition; - enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE); + enum_definition = bt_lookup_enum(&stream->stream_event_header->p, "id", FALSE); if (enum_definition) { id = enum_definition->integer->value._unsigned; } diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index b42ba03..00c928b 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -521,7 +521,7 @@ struct definition *lookup_definition(const struct definition *definition, struct definition_integer *lookup_integer(const struct definition *definition, const char *field_name, int signedness); -struct definition_enum *lookup_enum(const struct definition *definition, +struct definition_enum *bt_lookup_enum(const struct definition *definition, const char *field_name, int signedness); struct definition *lookup_variant(const struct definition *definition, diff --git a/types/types.c b/types/types.c index 5599027..139e318 100644 --- a/types/types.c +++ b/types/types.c @@ -642,7 +642,7 @@ struct definition_integer *lookup_integer(const struct definition *definition, return lookup_integer; } -struct definition_enum *lookup_enum(const struct definition *definition, +struct definition_enum *bt_lookup_enum(const struct definition *definition, const char *field_name, int signedness) { -- 1.7.10.4