X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta-validate.c;h=6070070c180f4c259ce7b93eb271d3058f8948bf;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=322718e08a442feaa58ed6e37fb5a364ace72e27;hpb=864cad701843d041ae0c9113fc2c20f9b3e1835d;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta-validate.c b/plugins/ctf/common/metadata/ctf-meta-validate.c
index 322718e0..6070070c 100644
--- a/plugins/ctf/common/metadata/ctf-meta-validate.c
+++ b/plugins/ctf/common/metadata/ctf-meta-validate.c
@@ -15,9 +15,9 @@
 #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-VALIDATE"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
@@ -31,8 +31,6 @@ int validate_stream_class(struct ctf_stream_class *sc)
 	int ret = 0;
 	struct ctf_field_class_int *int_fc;
 	struct ctf_field_class *fc;
-	bool has_total_size = false;
-	bool has_content_size = false;
 
 	if (sc->is_translated) {
 		goto end;
@@ -131,8 +129,6 @@ int validate_stream_class(struct ctf_stream_class *sc)
 				"`packet_size` member is signed.");
 			goto invalid;
 		}
-
-		has_total_size = true;
 	}
 
 	fc = ctf_field_class_struct_borrow_member_field_class_by_name(
@@ -152,15 +148,6 @@ int validate_stream_class(struct ctf_stream_class *sc)
 				"`content_size` member is signed.");
 			goto invalid;
 		}
-
-		has_content_size = true;
-	}
-
-	if (has_content_size && !has_total_size) {
-			BT_LOGE_STR("Invalid packet context field class: "
-				"`content_size` member exists without "
-				"`packet_size` member.");
-			goto invalid;
 	}
 
 	fc = ctf_field_class_struct_borrow_member_field_class_by_name(