X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fgenevent.c;h=aba40e528d204b411c2dcef8c54ec93d245b85e7;hb=f5f2fde40f9f8c3dbc82eeaedcdca7d7f9b6f56c;hp=a691d48150be7f133c5c9c8ec0b763c1145b049f;hpb=ffaf5031680617709c7ae1b7f1a3cf5cdf784805;p=lttv.git

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index a691d481..aba40e52 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -1068,8 +1068,15 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 
 	fprintf(fd, "{\n");
 
-	print_tabs(1, fd);
-	fprintf(fd, "size_t size;\n");
+	switch(td->type) {
+		case STRING:
+			print_tabs(1, fd);
+			fprintf(fd, "size_t size;\n");
+			break;
+		default:
+			break;
+	}
+
 	print_tabs(1, fd);
 	fprintf(fd, "size_t align;\n");
 	fprintf(fd, "\n");
@@ -1126,11 +1133,9 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		fprintf(fd, "/* Contains only fixed size fields : use compiler sizeof() */\n");
 		fprintf(fd, "\n");
 		print_tabs(1, fd);
-		fprintf(fd, "size = sizeof(");
+		fprintf(fd, "*len += sizeof(");
 		if(print_type(td, fd, 0, basename, field_name)) return 1;
 		fprintf(fd, ");\n");
-		print_tabs(1, fd);
-		fprintf(fd, "*len += size;\n");
 	} else {
 		/* The type contains nested variable size subtypes :
 		 * we must write field by field. */