Re: [lttng-dev] [BABELTRACE PATCH] Namespace the lookup_enum function

[Julien Desfossez <jdesfossez@efficios.com>]

For info, this patch was merged in Babeltrace master, see commit
9e3274b092343c999fcde33854d2df37b3702496

Thanks,

Julien

On 13/01/13 12:57 PM, Mathieu Desnoyers wrote:
> * 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
>>
>