X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fenum.c;h=e0a2b4d49d9cfc9049caa6c8011c0bb410f081c0;hb=889aa6c01b16ee877ca221ed64c79457d01d51c4;hp=153c82bd1f7e406770439f24634354211626a72f;hpb=d11e9c4975d88591e2324b6b11f426a22995833f;p=babeltrace.git

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index 153c82bd..e0a2b4d4 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -3,7 +3,9 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -17,10 +19,11 @@
  */
 
 #include <babeltrace/ctf/types.h>
+#include <inttypes.h>
 #include <stdint.h>
 #include <glib.h>
 
-void ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_enum *enum_definition =
 		container_of(definition, struct definition_enum, p);
@@ -31,27 +34,39 @@ void ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
 	const struct declaration_integer *integer_declaration =
 		integer_definition->declaration;
 	GArray *qs;
+	int ret;
 
-	ctf_integer_read(ppos, &integer_definition->p);
-	if (!integer_declaration->signedness)
+	ret = ctf_integer_read(ppos, &integer_definition->p);
+	if (ret)
+		return ret;
+	if (!integer_declaration->signedness) {
 		qs = enum_uint_to_quark_set(enum_declaration,
 			integer_definition->value._unsigned);
-	else
+		if (!qs) {
+			fprintf(stderr, "[warning] Unknown value %" PRIu64 " in enum.\n",
+				integer_definition->value._unsigned);
+		}
+	} else {
 		qs = enum_int_to_quark_set(enum_declaration,
 			integer_definition->value._signed);
-	assert(qs);
+		if (!qs) {
+			fprintf(stderr, "[warning] Unknown value %" PRId64 " in enum.\n",
+				integer_definition->value._signed);
+		}
+	}
 	/* unref previous quark set */
 	if (enum_definition->value)
 		g_array_unref(enum_definition->value);
 	enum_definition->value = qs;
+	return 0;
 }
 
-void ctf_enum_write(struct stream_pos *pos, struct definition *definition)
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition)
 {
 	struct definition_enum *enum_definition =
 		container_of(definition, struct definition_enum, p);
 	struct definition_integer *integer_definition =
 		enum_definition->integer;
 
-	ctf_integer_write(pos, &integer_definition->p);
+	return ctf_integer_write(pos, &integer_definition->p);
 }