X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fresolve-field-path.c;h=597eb74325fed5a9e39a795b6e9e66c71d9f26b3;hb=83ebb7f1751a20c7ba771442487f863331c754ef;hp=40bc7fccce178e21934b31966bd7cb1958bf8a6d;hpb=e6276565e1dbc12fa132cf1b59376580c0d94330;p=babeltrace.git

diff --git a/lib/trace-ir/resolve-field-path.c b/lib/trace-ir/resolve-field-path.c
index 40bc7fcc..597eb743 100644
--- a/lib/trace-ir/resolve-field-path.c
+++ b/lib/trace-ir/resolve-field-path.c
@@ -25,8 +25,7 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/assert-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/trace-ir/field-classes-internal.h>
+#include <babeltrace/trace-ir/field-class-internal.h>
 #include <babeltrace/trace-ir/field-path-internal.h>
 #include <babeltrace/trace-ir/field-path-const.h>
 #include <babeltrace/trace-ir/resolve-field-path-internal.h>
@@ -125,24 +124,12 @@ struct bt_field_path *find_field_class_in_ctx(struct bt_field_class *fc,
 	struct bt_field_path *field_path = NULL;
 	int ret;
 
-	ret = find_field_class(ctx->packet_header, BT_SCOPE_PACKET_HEADER,
-		fc, &field_path);
-	if (ret || field_path) {
-		goto end;
-	}
-
 	ret = find_field_class(ctx->packet_context, BT_SCOPE_PACKET_CONTEXT,
 		fc, &field_path);
 	if (ret || field_path) {
 		goto end;
 	}
 
-	ret = find_field_class(ctx->event_header, BT_SCOPE_EVENT_HEADER,
-		fc, &field_path);
-	if (ret || field_path) {
-		goto end;
-	}
-
 	ret = find_field_class(ctx->event_common_context,
 		BT_SCOPE_EVENT_COMMON_CONTEXT, fc, &field_path);
 	if (ret || field_path) {
@@ -210,12 +197,8 @@ struct bt_field_class *borrow_root_field_class(
 		struct bt_resolve_field_path_context *ctx, enum bt_scope scope)
 {
 	switch (scope) {
-	case BT_SCOPE_PACKET_HEADER:
-		return ctx->packet_header;
 	case BT_SCOPE_PACKET_CONTEXT:
 		return ctx->packet_context;
-	case BT_SCOPE_EVENT_HEADER:
-		return ctx->event_header;
 	case BT_SCOPE_EVENT_COMMON_CONTEXT:
 		return ctx->event_common_context;
 	case BT_SCOPE_EVENT_SPECIFIC_CONTEXT: