Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / formats / ctf / types / enum.c

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index 153c82bd1f7e406770439f24634354211626a72f..c2b50fd532f1b3736a360f1e4bdab5e9cf80c66f 100644 (file)
--- 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
@@ -20,7 +22,7 @@
 #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,8 +33,11 @@ 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);
+       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);
@@ -44,14 +49,15 @@ void ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
        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);
 }