From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 21 May 2011 22:02:24 +0000 (-0400)
Subject: Update integer encoding
X-Git-Tag: v0.1~35
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b5bf4179a8ae55a9da305834564e2090f1c179bf

Update integer encoding

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 09ce1847..b62f33d7 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -350,6 +350,11 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
 
 		/* TYPEDEC_NESTED */
 
+		if (!nested_declaration) {
+			fprintf(fd, "[error] %s: nested type is unknown.\n", __func__);
+			return NULL;
+		}
+
 		/* create array/sequence, pass nested_declaration as child. */
 		if (cds_list_empty(&node_type_declarator->u.type_declarator.u.nested.length)) {
 			fprintf(fd, "[error] %s: expecting length field reference or value.\n", __func__);
@@ -1187,6 +1192,8 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 			else if (!strcmp(s_right, "ASCII")
 			    || !strcmp(s_right, "ascii"))
 				encoding = CTF_STRING_ASCII;
+			else if (!strcmp(s_right, "none"))
+				encoding = CTF_STRING_NONE;
 			else {
 				fprintf(fd, "[error] %s: unknown string encoding \"%s\"\n", __func__, s_right);
 				g_free(s_right);