X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;h=53ebf75c30eec90f36d0c677f4ad98b5caa6bbc6;hp=6aa5750cdb10d6a8373a16fd7ac517325ef590c8;hb=0d69b916c5ba44b63a26aa038d416d6ee286306b;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index 6aa5750c..53ebf75c 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -16,11 +16,19 @@
  *
  * 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_sequence_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_sequence *sequence_definition =
 		container_of(definition, struct definition_sequence, p);
@@ -38,7 +46,7 @@ int ctf_sequence_read(struct stream_pos *ppos, struct definition *definition)
 
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
-				uint64_t len = sequence_len(sequence_definition);
+				uint64_t len = bt_sequence_len(sequence_definition);
 
 				ctf_align_pos(pos, integer_declaration->p.alignment);
 				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
@@ -52,10 +60,10 @@ int ctf_sequence_read(struct stream_pos *ppos, struct definition *definition)
 			}
 		}
 	}
-	return sequence_rw(ppos, definition);
+	return bt_sequence_rw(ppos, definition);
 }
 
-int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_sequence *sequence_definition =
 		container_of(definition, struct definition_sequence, p);
@@ -73,7 +81,7 @@ int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
 
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
-				uint64_t len = sequence_len(sequence_definition);
+				uint64_t len = bt_sequence_len(sequence_definition);
 
 				ctf_align_pos(pos, integer_declaration->p.alignment);
 				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
@@ -86,5 +94,5 @@ int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
 			}
 		}
 	}
-	return sequence_rw(ppos, definition);
+	return bt_sequence_rw(ppos, definition);
 }