From 2225de6b8f05fe96d5b85d02e82fb5bf82903f44 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 12 Jun 2017 18:03:40 -0400 Subject: [PATCH] ir: fields.c: fix public function names to get/set struct. field MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To remain symmetric, use bt_ctf_field_structure_get_field_by_name() and bt_ctf_field_structure_set_field_by_name(), as it is possible that bt_ctf_field_structure_set_field_by_index() exists in the future. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- include/babeltrace/ctf-ir/fields.h | 24 +++++++++++++----------- lib/ctf-ir/event.c | 4 ++-- lib/ctf-ir/fields.c | 2 +- plugins/lttng-utils/copy.c | 3 ++- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/babeltrace/ctf-ir/fields.h b/include/babeltrace/ctf-ir/fields.h index 144b1e31..15468f4f 100644 --- a/include/babeltrace/ctf-ir/fields.h +++ b/include/babeltrace/ctf-ir/fields.h @@ -85,13 +85,14 @@ contained fields with the following getters if such fields do not exist yet: - bt_ctf_field_enumeration_get_container() -- bt_ctf_field_structure_get_field() +- bt_ctf_field_structure_get_field_by_name() - bt_ctf_field_array_get_field() - bt_ctf_field_sequence_get_field() - bt_ctf_field_variant_get_field() If you already have a field object, you can also assign it to a specific -name within a @structfield with bt_ctf_field_structure_set_field(). +name within a @structfield with +bt_ctf_field_structure_set_field_by_name(). You can get a reference to the @ft which was used to create a field with bt_ctf_field_get_type(). You can get the @@ -828,10 +829,10 @@ contains an ordered list of zero or more named @fields which can be different @fts, and which is described by a @structft. To set the value of a specific field of a structure field, you need to -first get the field with bt_ctf_field_structure_get_field() or +first get the field with bt_ctf_field_structure_get_field_by_name() or bt_ctf_field_structure_get_field_by_index(). If you already have a field object, you can assign it to a specific name within a structure -field with bt_ctf_field_structure_set_field(). +field with bt_ctf_field_structure_set_field_by_name(). @sa ctfirstructfieldtype @sa ctfirfields @@ -861,8 +862,8 @@ exist. @sa bt_ctf_field_structure_get_field_by_index(): Returns the field of a given structure field by index. -@sa bt_ctf_field_structure_set_field(): Sets the field of a given - structure field. +@sa bt_ctf_field_structure_set_field_by_name(): Sets the field of a + given structure field by name. */ extern struct bt_ctf_field *bt_ctf_field_structure_get_field_by_name( struct bt_ctf_field *struct_field, const char *name); @@ -888,10 +889,10 @@ extern struct bt_ctf_field *bt_ctf_field_structure_get_field_by_name( @postrefcountsame{struct_field} @postsuccessrefcountretinc -@sa bt_ctf_field_structure_get_field(): Returns the field of a +@sa bt_ctf_field_structure_get_field_by_name(): Returns the field of a + given structure field by name. +@sa bt_ctf_field_structure_set_field_by_name(): Sets the field of a given structure field by name. -@sa bt_ctf_field_structure_set_field(): Sets the field of a given - structure field. */ extern struct bt_ctf_field *bt_ctf_field_structure_get_field_by_index( struct bt_ctf_field *struct_field, uint64_t index); @@ -933,10 +934,11 @@ bt_ctf_trace_get_packet_header_type() for the parent trace class of @sa bt_ctf_field_structure_get_field_by_index(): Returns the field of a given structure field by index. -@sa bt_ctf_field_structure_get_field(): Returns the field of a +@sa bt_ctf_field_structure_get_field_by_name(): Returns the field of a given structure field by name. */ -extern int bt_ctf_field_structure_set_field(struct bt_ctf_field *struct_field, +extern int bt_ctf_field_structure_set_field_by_name( + struct bt_ctf_field *struct_field, const char *name, struct bt_ctf_field *field); /** @} */ diff --git a/lib/ctf-ir/event.c b/lib/ctf-ir/event.c index d1a7f777..47eeed46 100644 --- a/lib/ctf-ir/event.c +++ b/lib/ctf-ir/event.c @@ -340,8 +340,8 @@ int bt_ctf_event_set_payload(struct bt_ctf_event *event, } if (name) { - ret = bt_ctf_field_structure_set_field(event->fields_payload, - name, payload); + ret = bt_ctf_field_structure_set_field_by_name( + event->fields_payload, name, payload); } else { struct bt_ctf_field_type *payload_type; diff --git a/lib/ctf-ir/fields.c b/lib/ctf-ir/fields.c index e9c6d8be..3ee3b950 100644 --- a/lib/ctf-ir/fields.c +++ b/lib/ctf-ir/fields.c @@ -662,7 +662,7 @@ error: return ret_field; } -int bt_ctf_field_structure_set_field(struct bt_ctf_field *field, +int bt_ctf_field_structure_set_field_by_name(struct bt_ctf_field *field, const char *name, struct bt_ctf_field *value) { int ret = 0; diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c index d3a6878b..db828c42 100644 --- a/plugins/lttng-utils/copy.c +++ b/plugins/lttng-utils/copy.c @@ -1805,7 +1805,8 @@ int copy_set_debug_info_stream_event_context(FILE *err, goto error; } - ret = bt_ctf_field_structure_set_field(writer_event_context, + ret = bt_ctf_field_structure_set_field_by_name( + writer_event_context, field_name, copy_field); if (ret) { fprintf(err, "[error] %s in %s:%d\n", __func__, -- 2.34.1