From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 492 invoked by alias); 9 Jan 2013 19:48:57 -0000 Received: (qmail 482 invoked by uid 22791); 9 Jan 2013 19:48:56 -0000 X-SWARE-Spam-Status: No, hits=-3.4 required=5.0 tests=BAYES_00,KHOP_THREADED X-Spam-Check-By: sourceware.org Received: from smtp.ini-tech.com (HELO smtp.ini-tech.com) (213.239.202.151) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 09 Jan 2013 19:48:51 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.ini-tech.com (Postfix) with ESMTP id 94B3B18741C; Wed, 9 Jan 2013 14:51:54 -0500 (EST) Received: from smtp.ini-tech.com ([127.0.0.1]) by localhost (smtp.ini-tech.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id GVDN0DfL90uc; Wed, 9 Jan 2013 14:51:54 -0500 (EST) Received: from sinkpad.home.lan (unknown [96.127.200.221]) by smtp.ini-tech.com (Postfix) with ESMTPSA id 02E741873E6; Wed, 9 Jan 2013 14:51:52 -0500 (EST) From: Julien Desfossez 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 Subject: [BABELTRACE PATCH] Namespace the lookup_enum function Date: Wed, 09 Jan 2013 19:48:00 -0000 Message-Id: <1357760893-11961-1-git-send-email-jdesfossez@efficios.com> In-Reply-To: <20130107211855.GB3678@Krystal> References: <20130107211855.GB3678@Krystal> Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00035.txt.bz2 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