From e6276565e1dbc12fa132cf1b59376580c0d94330 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 7 Dec 2018 15:23:05 -0500 Subject: [PATCH] Fix typo: "field classe" -> "field class" Signed-off-by: Philippe Proulx --- lib/trace-ir/event-class.c | 12 ++++++------ lib/trace-ir/event-header-field.c | 2 +- lib/trace-ir/event.c | 2 +- lib/trace-ir/field-wrapper.c | 2 +- lib/trace-ir/fields.c | 2 +- lib/trace-ir/packet-context-field.c | 2 +- lib/trace-ir/packet.c | 4 ++-- lib/trace-ir/resolve-field-path.c | 28 ++++++++++++++-------------- lib/trace-ir/stream-class.c | 18 +++++++++--------- lib/trace-ir/trace-class.c | 8 ++++---- lib/trace-ir/trace.c | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c index 971d8115..76a35e8d 100644 --- a/lib/trace-ir/event-class.c +++ b/lib/trace-ir/event-class.c @@ -70,9 +70,9 @@ void destroy_event_class(struct bt_object *obj) event_class->emf_uri.str = NULL; } - BT_LOGD_STR("Putting context field classe."); + BT_LOGD_STR("Putting context field class."); BT_OBJECT_PUT_REF_AND_RESET(event_class->specific_context_fc); - BT_LOGD_STR("Putting payload field classe."); + BT_LOGD_STR("Putting payload field class."); BT_OBJECT_PUT_REF_AND_RESET(event_class->payload_fc); bt_object_pool_finalize(&event_class->event_pool); g_free(obj); @@ -296,7 +296,7 @@ int bt_event_class_set_specific_context_field_class( BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Specific context field classe is not a structure field classe: " + "Specific context field class is not a structure field class: " "%!+F", field_class); stream_class = bt_event_class_borrow_stream_class_inline( event_class); @@ -317,7 +317,7 @@ int bt_event_class_set_specific_context_field_class( event_class->specific_context_fc = field_class; bt_object_get_no_null_check(event_class->specific_context_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set event class's specific context field classe: %!+E", + BT_LIB_LOGV("Set event class's specific context field class: %!+E", event_class); end: @@ -352,7 +352,7 @@ int bt_event_class_set_payload_field_class( BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Payload field classe is not a structure field classe: %!+F", + "Payload field class is not a structure field class: %!+F", field_class); stream_class = bt_event_class_borrow_stream_class_inline( event_class); @@ -374,7 +374,7 @@ int bt_event_class_set_payload_field_class( event_class->payload_fc = field_class; bt_object_get_no_null_check(event_class->payload_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set event class's payload field classe: %!+E", event_class); + BT_LIB_LOGV("Set event class's payload field class: %!+E", event_class); end: return ret; diff --git a/lib/trace-ir/event-header-field.c b/lib/trace-ir/event-header-field.c index b877180c..22d8a692 100644 --- a/lib/trace-ir/event-header-field.c +++ b/lib/trace-ir/event-header-field.c @@ -65,7 +65,7 @@ struct bt_event_header_field *bt_event_header_field_create( BT_ASSERT_PRE(bt_stream_class_borrow_trace_class_inline(stream_class), "Stream class is not part of a trace: %!+S", stream_class); BT_ASSERT_PRE(stream_class->event_header_fc, - "Stream class has no event header field classe: %!+S", + "Stream class has no event header field class: %!+S", stream_class); field_wrapper = bt_field_wrapper_create( &stream_class->event_header_field_pool, diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c index 5b498604..47ff78bf 100644 --- a/lib/trace-ir/event.c +++ b/lib/trace-ir/event.c @@ -384,7 +384,7 @@ int bt_event_move_header_field(struct bt_event *event, BT_ASSERT_PRE_EVENT_HOT(event); stream_class = bt_event_class_borrow_stream_class_inline(event->class); BT_ASSERT_PRE(stream_class->event_header_fc, - "Stream class has no event header field classe: %!+S", + "Stream class has no event header field class: %!+S", stream_class); /* Recycle current header field: always exists */ diff --git a/lib/trace-ir/field-wrapper.c b/lib/trace-ir/field-wrapper.c index 08cd11e6..efff4a1f 100644 --- a/lib/trace-ir/field-wrapper.c +++ b/lib/trace-ir/field-wrapper.c @@ -83,7 +83,7 @@ struct bt_field_wrapper *bt_field_wrapper_create( if (!field_wrapper->field) { field_wrapper->field = (void *) bt_field_create(fc); if (!field_wrapper->field) { - BT_LIB_LOGE("Cannot create field wrapper from field classe: " + BT_LIB_LOGE("Cannot create field wrapper from field class: " "%![fc-]+F", fc); goto error; } diff --git a/lib/trace-ir/fields.c b/lib/trace-ir/fields.c index 519d65e5..275c02b9 100644 --- a/lib/trace-ir/fields.c +++ b/lib/trace-ir/fields.c @@ -211,7 +211,7 @@ struct bt_field *bt_field_create(struct bt_field_class *fc) BT_ASSERT(bt_field_class_has_known_type(fc)); field = field_create_funcs[fc->type](fc); if (!field) { - BT_LIB_LOGE("Cannot create field object from field classe: " + BT_LIB_LOGE("Cannot create field object from field class: " "%![fc-]+F", fc); goto end; } diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c index 9eff755e..1b2e7ef8 100644 --- a/lib/trace-ir/packet-context-field.c +++ b/lib/trace-ir/packet-context-field.c @@ -66,7 +66,7 @@ struct bt_packet_context_field *bt_packet_context_field_create( "Stream class is not part of a trace class: %!+S", stream_class); BT_ASSERT_PRE(stream_class->packet_context_fc, - "Stream class has no packet context field classe: %!+S", + "Stream class has no packet context field class: %!+S", stream_class); field_wrapper = bt_field_wrapper_create( &stream_class->packet_context_field_pool, diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c index dd1df856..51bce30e 100644 --- a/lib/trace-ir/packet.c +++ b/lib/trace-ir/packet.c @@ -358,7 +358,7 @@ int bt_packet_move_header_field(struct bt_packet *packet, BT_ASSERT_PRE_PACKET_HOT(packet); tc = bt_stream_class_borrow_trace_class_inline(packet->stream->class); BT_ASSERT_PRE(tc->packet_header_fc, - "Trace class has no packet header field classe: %!+T", tc); + "Trace class has no packet header field class: %!+T", tc); BT_ASSERT_PRE(field_wrapper->field->class == tc->packet_header_fc, "Unexpected packet header field's class: " @@ -385,7 +385,7 @@ int bt_packet_move_context_field(struct bt_packet *packet, BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet); stream_class = packet->stream->class; BT_ASSERT_PRE(stream_class->packet_context_fc, - "Stream class has no packet context field classe: %!+S", + "Stream class has no packet context field class: %!+S", stream_class); BT_ASSERT_PRE(field_wrapper->field->class == stream_class->packet_context_fc, diff --git a/lib/trace-ir/resolve-field-path.c b/lib/trace-ir/resolve-field-path.c index fc4727bf..40bc7fcc 100644 --- a/lib/trace-ir/resolve-field-path.c +++ b/lib/trace-ir/resolve-field-path.c @@ -336,8 +336,8 @@ bool lca_is_structure_field_class(struct bt_field_path *src_field_path, if (!prev_fc) { /* * This is correct: the LCA is the root - * scope field classe, which must be a - * structure field classe. + * scope field class, which must be a + * structure field class. */ break; } @@ -452,14 +452,14 @@ bool field_path_is_valid(struct bt_field_class *src_fc, tgt_fc, ctx); if (!src_field_path) { - BT_ASSERT_PRE_MSG("Cannot find requesting field classe in " + BT_ASSERT_PRE_MSG("Cannot find requesting field class in " "resolving context: %!+F", src_fc); is_valid = false; goto end; } if (!tgt_field_path) { - BT_ASSERT_PRE_MSG("Cannot find target field classe in " + BT_ASSERT_PRE_MSG("Cannot find target field class in " "resolving context: %!+F", tgt_fc); is_valid = false; goto end; @@ -467,8 +467,8 @@ bool field_path_is_valid(struct bt_field_class *src_fc, /* Target must be before source */ if (!target_is_before_source(src_field_path, tgt_field_path)) { - BT_ASSERT_PRE_MSG("Target field classe is located after " - "requesting field classe: %![req-fc-]+F, %![tgt-fc-]+F", + BT_ASSERT_PRE_MSG("Target field class is located after " + "requesting field class: %![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc); is_valid = false; goto end; @@ -480,19 +480,19 @@ bool field_path_is_valid(struct bt_field_class *src_fc, */ if (!target_field_path_in_different_scope_has_struct_fc_only( src_field_path, tgt_field_path, ctx)) { - BT_ASSERT_PRE_MSG("Target field classe is located in a " - "different scope than requesting field classe, " - "but within an array or a variant field classe: " + BT_ASSERT_PRE_MSG("Target field class is located in a " + "different scope than requesting field class, " + "but within an array or a variant field class: " "%![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc); is_valid = false; goto end; } - /* Same scope: LCA must be a structure field classe */ + /* Same scope: LCA must be a structure field class */ if (!lca_is_structure_field_class(src_field_path, tgt_field_path, ctx)) { BT_ASSERT_PRE_MSG("Lowest common ancestor of target and " - "requesting field classes is not a structure field classe: " + "requesting field classes is not a structure field class: " "%![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc); is_valid = false; @@ -503,8 +503,8 @@ bool field_path_is_valid(struct bt_field_class *src_fc, if (!lca_to_target_has_struct_fc_only(src_field_path, tgt_field_path, ctx)) { BT_ASSERT_PRE_MSG("Path from lowest common ancestor of target " - "and requesting field classes to target field classe " - "contains an array or a variant field classe: " + "and requesting field classes to target field class " + "contains an array or a variant field class: " "%![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc); is_valid = false; goto end; @@ -522,7 +522,7 @@ struct bt_field_path *resolve_field_path(struct bt_field_class *src_fc, struct bt_resolve_field_path_context *ctx) { BT_ASSERT_PRE(field_path_is_valid(src_fc, tgt_fc, ctx), - "Invalid target field classe: %![req-fc-]+F, %![tgt-fc-]+F", + "Invalid target field class: %![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc); return find_field_class_in_ctx(tgt_fc, ctx); } diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index 4a47853f..dfef7436 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -70,11 +70,11 @@ void destroy_stream_class(struct bt_object *obj) stream_class->name.value = NULL; } - BT_LOGD_STR("Putting event header field classe."); + BT_LOGD_STR("Putting event header field class."); BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc); - BT_LOGD_STR("Putting packet context field classe."); + BT_LOGD_STR("Putting packet context field class."); BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc); - BT_LOGD_STR("Putting event common context field classe."); + BT_LOGD_STR("Putting event common context field class."); BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_common_context_fc); bt_object_pool_finalize(&stream_class->event_header_field_pool); bt_object_pool_finalize(&stream_class->packet_context_field_pool); @@ -318,7 +318,7 @@ int bt_stream_class_set_packet_context_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Packet context field classe is not a structure field classe: %!+F", + "Packet context field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; @@ -332,7 +332,7 @@ int bt_stream_class_set_packet_context_field_class( stream_class->packet_context_fc = field_class; bt_object_get_no_null_check(stream_class->packet_context_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's packet context field classe: %!+S", + BT_LIB_LOGV("Set stream class's packet context field class: %!+S", stream_class); end: @@ -365,7 +365,7 @@ int bt_stream_class_set_event_header_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Event header field classe is not a structure field classe: %!+F", + "Event header field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; @@ -380,7 +380,7 @@ int bt_stream_class_set_event_header_field_class( stream_class->event_header_fc = field_class; bt_object_get_no_null_check(stream_class->event_header_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's event header field classe: %!+S", + BT_LIB_LOGV("Set stream class's event header field class: %!+S", stream_class); end: @@ -414,7 +414,7 @@ int bt_stream_class_set_event_common_context_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Event common context field classe is not a structure field classe: %!+F", + "Event common context field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; @@ -430,7 +430,7 @@ int bt_stream_class_set_event_common_context_field_class( stream_class->event_common_context_fc = field_class; bt_object_get_no_null_check(stream_class->event_common_context_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's event common context field classe: %!+S", + BT_LIB_LOGV("Set stream class's event common context field class: %!+S", stream_class); end: diff --git a/lib/trace-ir/trace-class.c b/lib/trace-ir/trace-class.c index b8c99470..709810ef 100644 --- a/lib/trace-ir/trace-class.c +++ b/lib/trace-ir/trace-class.c @@ -85,7 +85,7 @@ void destroy_trace_class(struct bt_object *obj) tc->stream_classes = NULL; } - BT_LOGD_STR("Putting packet header field classe."); + BT_LOGD_STR("Putting packet header field class."); bt_object_put_ref(tc->packet_header_fc); tc->packet_header_fc = NULL; g_free(tc); @@ -378,7 +378,7 @@ int bt_trace_class_set_packet_header_field_class( BT_ASSERT_PRE_TRACE_CLASS_HOT(tc); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Packet header field classe is not a structure field classe: %!+F", + "Packet header field class is not a structure field class: %!+F", field_class); ret = bt_resolve_field_paths(field_class, &resolve_ctx); if (ret) { @@ -390,7 +390,7 @@ int bt_trace_class_set_packet_header_field_class( tc->packet_header_fc = field_class; bt_object_get_no_null_check(tc->packet_header_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set trace class's packet header field classe: %!+T", tc); + BT_LIB_LOGV("Set trace class's packet header field class: %!+T", tc); end: return ret; @@ -399,7 +399,7 @@ end: BT_HIDDEN void _bt_trace_class_freeze(const struct bt_trace_class *tc) { - /* The packet header field classe is already frozen */ + /* The packet header field class is already frozen */ BT_ASSERT(tc); BT_LIB_LOGD("Freezing trace class: %!+T", tc); ((struct bt_trace_class *) tc)->frozen = true; diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c index f47b23d6..94e88d3d 100644 --- a/lib/trace-ir/trace.c +++ b/lib/trace-ir/trace.c @@ -361,7 +361,7 @@ int bt_trace_remove_is_static_listener(const struct bt_trace *c_trace, BT_HIDDEN void _bt_trace_freeze(const struct bt_trace *trace) { - /* The packet header field classe is already frozen */ + /* The packet header field class is already frozen */ BT_ASSERT(trace); BT_LIB_LOGD("Freezing trace's class: %!+T", trace->class); bt_trace_class_freeze(trace->class); -- 2.34.1