X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Farray.c;h=b1e8d6c5af7b316110b31920a7a61ed125ac4c98;hp=71475014b9034e33bdc055aa355de4ee527d0b82;hb=70fd5a515016525961d4bef0d627616abdc9bc28;hpb=81dee1bb528a95f7bf2bc622948807150794a75e

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index 71475014..b1e8d6c5 100644
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -3,7 +3,9 @@
  *
  * Array format access functions.
  *
- * Copyright 2010 - 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
@@ -14,17 +16,25 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_array_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_array *array_definition =
 		container_of(definition, struct definition_array, p);
 	struct declaration_array *array_declaration =
 		array_definition->declaration;
-	struct declaration *elem = array_declaration->elem;
+	struct bt_declaration *elem = array_declaration->elem;
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -38,7 +48,8 @@ int ctf_array_read(struct stream_pos *ppos, struct definition *definition)
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+					return -EFAULT;
 				if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
 					return -EFAULT;
 
@@ -46,21 +57,22 @@ int ctf_array_read(struct stream_pos *ppos, struct definition *definition)
 				g_string_insert_len(array_definition->string,
 					0, (char *) ctf_get_pos_addr(pos),
 					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+				if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+					return -EFAULT;
 				return 0;
 			}
 		}
 	}
-	return array_rw(ppos, definition);
+	return bt_array_rw(ppos, definition);
 }
 
-int ctf_array_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_array *array_definition =
 		container_of(definition, struct definition_array, p);
 	struct declaration_array *array_declaration =
 		array_definition->declaration;
-	struct declaration *elem = array_declaration->elem;
+	struct bt_declaration *elem = array_declaration->elem;
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -74,17 +86,19 @@ int ctf_array_write(struct stream_pos *ppos, struct definition *definition)
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+					return -EFAULT;
 				if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
 					return -EFAULT;
 
 				memcpy((char *) ctf_get_pos_addr(pos),
 					array_definition->string->str,
 					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+				if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+					return -EFAULT;
 				return 0;
 			}
 		}
 	}
-	return array_rw(ppos, definition);
+	return bt_array_rw(ppos, definition);
 }