namespace the lookup_integer function

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index ba403aa629e2b0bfdcd5a5370b2ead441db9fea1..deb9a66d195d989d98373346423ca407d9dde494 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -427,7 +427,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
                if (unlikely(ret))
                        goto error;
                /* lookup event id */
                if (unlikely(ret))
                        goto error;
                /* lookup event id */

-               integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
+               integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "id", FALSE);

                if (integer_definition) {
                        id = integer_definition->value._unsigned;
                } else {
                if (integer_definition) {
                        id = integer_definition->value._unsigned;
                } else {


@@ -441,7 +441,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
 
                variant = bt_lookup_variant(&stream->stream_event_header->p, "v");
                if (variant) {
 
                variant = bt_lookup_variant(&stream->stream_event_header->p, "v");
                if (variant) {

-                       integer_definition = lookup_integer(variant, "id", FALSE);
+                       integer_definition = bt_lookup_integer(variant, "id", FALSE);

                        if (integer_definition) {
                                id = integer_definition->value._unsigned;
                        }
                        if (integer_definition) {
                                id = integer_definition->value._unsigned;
                        }


@@ -450,13 +450,13 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
 
                /* lookup timestamp */
                stream->has_timestamp = 0;
 
                /* lookup timestamp */
                stream->has_timestamp = 0;

-               integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);
+               integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);

                if (integer_definition) {
                        ctf_update_timestamp(stream, integer_definition);
                        stream->has_timestamp = 1;
                } else {
                        if (variant) {
                if (integer_definition) {
                        ctf_update_timestamp(stream, integer_definition);
                        stream->has_timestamp = 1;
                } else {
                        if (variant) {

-                               integer_definition = lookup_integer(variant, "timestamp", FALSE);
+                               integer_definition = bt_lookup_integer(variant, "timestamp", FALSE);

                                if (integer_definition) {
                                        ctf_update_timestamp(stream, integer_definition);
                                        stream->has_timestamp = 1;
                                if (integer_definition) {
                                        ctf_update_timestamp(stream, integer_definition);
                                        stream->has_timestamp = 1;

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index f01a11c36e65f07ea20553d8ddd9520f4f29b166..d742b40ff730044f99d28a3ab6aca708909dc0d7 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -518,7 +518,7 @@ void bt_append_scope_path(const char *path, GArray *q);
  */
 struct definition *bt_lookup_definition(const struct definition *definition,
                                     const char *field_name);
  */
 struct definition *bt_lookup_definition(const struct definition *definition,
                                     const char *field_name);

-struct definition_integer *lookup_integer(const struct definition *definition,
+struct definition_integer *bt_lookup_integer(const struct definition *definition,

                                          const char *field_name,
                                          int signedness);
 struct definition_enum *bt_lookup_enum(const struct definition *definition,
                                          const char *field_name,
                                          int signedness);
 struct definition_enum *bt_lookup_enum(const struct definition *definition,

diff --git a/types/types.c b/types/types.c
index 25ce7151f298e18100b7100a4e4c0360e9e98e54..3e20dfe1fbc67f094b1f72658769278894b03789 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -624,7 +624,7 @@ struct definition *bt_lookup_definition(const struct definition *definition,
                                             scope);
 }
 
                                             scope);
 }
 

-struct definition_integer *lookup_integer(const struct definition *definition,
+struct definition_integer *bt_lookup_integer(const struct definition *definition,

                                          const char *field_name,
                                          int signedness)
 {
                                          const char *field_name,
                                          int signedness)
 {