Namespace the struct declaration

[babeltrace.git] / formats / ctf-text / types / struct.c

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index a10e4da1d9c6b0ee5735112c6cd118762c5374d0..cbfcc7cde2b00ea2a6b6686ad51ada158f56fb33 100644 (file)
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -16,18 +16,26 @@
  *
  * 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-text/types.h>
 #include <stdio.h>
 
-int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
-       struct declaration *declaration = definition->declaration;
+       struct bt_declaration *declaration = definition->declaration;
        struct declaration_struct *struct_declaration =
                container_of(declaration, struct declaration_struct, p);
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
-       uint64_t len = struct_declaration_len(struct_declaration);
+       uint64_t len = bt_struct_declaration_len(struct_declaration);
        int field_nr_saved;
        int ret;
 
@@ -50,7 +58,7 @@ int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition
        }
        field_nr_saved = pos->field_nr;
        pos->field_nr = 0;
-       ret = struct_rw(ppos, definition);
+       ret = bt_struct_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
                if (pos->depth >= 0 && (pos->print_names || len > 1)) {