X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=2a4dbfe25a40d8f206760054c80b196feaa4593b;hp=8e79b738f62f3e0ae64107daea7da72c4e620d26;hb=550aca336f90ab7bca145122d5b138132fa58fa5;hpb=cfc73fdcfb61cbfea3831c79f602825f87865878

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index 8e79b73..2a4dbfe 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -591,7 +591,7 @@ struct event_packet_context {
   uint8_t  stream_packet_count_bits;	/* Significant counter bits */
   uint8_t  compression_scheme;
   uint8_t  encryption_scheme;
-  uint8_t  checksum;
+  uint8_t  checksum_scheme;
 };
 
 
@@ -1165,11 +1165,11 @@ constant-expression-range:
 2.2) Declarations:
 
 declaration:
-	declaration-specifiers declarator-list-opt ;
+	declaration-specifiers ;
+	declaration-specifiers storage-class-specifier declaration-specifiers declarator-list ;
 	ctf-specifier ;
 
 declaration-specifiers:
-	storage-class-specifier declaration-specifiers-opt
 	type-specifier declaration-specifiers-opt
 	type-qualifier declaration-specifiers-opt
 
@@ -1199,7 +1199,7 @@ type-specifier:
 	ctf-type-specifier
 
 struct-specifier:
-	struct identifier-opt { struct-or-variant-declaration-list }
+	struct identifier-opt { struct-or-variant-declaration-list-opt }
 	struct identifier
 
 struct-or-variant-declaration-list:
@@ -1208,6 +1208,8 @@ struct-or-variant-declaration-list:
 
 struct-or-variant-declaration:
 	specifier-qualifier-list struct-or-variant-declarator-list ;
+	declaration-specifiers storage-class-specifier declaration-specifiers declarator-list ;
+	typealias declaration-specifiers declaration-specifiers declarator-list : declaration-specifiers declarator-list ;
 
 specifier-qualifier-list:
 	type-specifier specifier-qualifier-list-opt
@@ -1261,8 +1263,8 @@ direct-declarator:
 	direct-declarator [ constant-expression ]
 
 pointer:
-	type-qualifier-list-opt
-	type-qualifier-list-opt pointer
+	* type-qualifier-list-opt
+	* type-qualifier-list-opt pointer
 
 type-qualifier-list:
 	type-qualifier
@@ -1277,6 +1279,7 @@ ctf-specifier:
 	event { ctf-assignment-expression-list-opt }
 	stream { ctf-assignment-expression-list-opt }
 	trace { ctf-assignment-expression-list-opt }
+	typealias declaration-specifiers declaration-specifiers declarator-list : declaration-specifiers declarator-list ;
 
 ctf-type-specifier:
 	floating_point { ctf-assignment-expression-list-opt }
@@ -1290,3 +1293,5 @@ ctf-assignment-expression-list:
 ctf-assignment-expression:
 	unary-expression assignment-operator unary-expression
 	unary-expression type-assignment-operator type-specifier
+	declaration-specifiers storage-class-specifier declaration-specifiers declarator-list
+	typealias declaration-specifiers declaration-specifiers declarator-list : declaration-specifiers declarator-list