*
* 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
*
* 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);
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;
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);
- return 0;
+ /*
+ * We want to populate both the string
+ * and the underlying values, so carry
+ * on calling bt_array_rw().
+ */
}
}
}
- 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);
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);
}