From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21309 invoked by alias); 13 Jan 2013 17:58:11 -0000 Received: (qmail 21297 invoked by uid 22791); 13 Jan 2013 17:58:10 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.openrapids.net (HELO blackscsi.openrapids.net) (64.15.138.104) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 13 Jan 2013 17:57:58 +0000 Received: from localhost (localhost [127.0.0.1]) by blackscsi.openrapids.net (Postfix) with ESMTP id B164014026D; Sun, 13 Jan 2013 12:57:55 -0500 (EST) Received: from blackscsi.openrapids.net ([127.0.0.1]) by localhost (blackscsi.openrapids.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bHRcMtPfoFp6; Sun, 13 Jan 2013 12:57:54 -0500 (EST) Received: by blackscsi.openrapids.net (Postfix, from userid 1003) id B3DE2140552; Sun, 13 Jan 2013 12:57:54 -0500 (EST) Date: Sun, 13 Jan 2013 17:58:00 -0000 From: Mathieu Desnoyers To: Julien Desfossez Cc: teawater@gmail.com, lttng-dev@lists.lttng.org, gdb@sourceware.org, tromey@redhat.com, palves@redhat.com Subject: Re: [BABELTRACE PATCH] Namespace the lookup_enum function Message-ID: <20130113175754.GA3917@Krystal> References: <20130107211855.GB3678@Krystal> <1357760893-11961-1-git-send-email-jdesfossez@efficios.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1357760893-11961-1-git-send-email-jdesfossez@efficios.com> X-Editor: vi User-Agent: Mutt/1.5.18 (2008-05-17) 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/msg00049.txt.bz2 * Julien Desfossez (jdesfossez@efficios.com) wrote: > 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. Hi Julien, Since we know these changes are needed, can you provide patches with proper changelogs, and I'll pull them. Thanks, Mathieu > > 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 > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com