namespace definition_ref and definition_unref

[babeltrace.git] / types / sequence.c

diff --git a/types/sequence.c b/types/sequence.c
index 7d060e4b06224098fe7acfeceda84f8a24589077..736e866439bfbcf90b17df5be9a6ffe000da2eec 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -16,10 +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/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
@@ -86,7 +95,7 @@ void _sequence_declaration_free(struct declaration *declaration)
 
        free_declaration_scope(sequence_declaration->scope);
        g_array_free(sequence_declaration->length_name, TRUE);
-       declaration_unref(sequence_declaration->elem);
+       bt_declaration_unref(sequence_declaration->elem);
        g_free(sequence_declaration);
 }
 
@@ -102,9 +111,9 @@ struct declaration_sequence *
        declaration = &sequence_declaration->p;
 
        sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
-       append_scope_path(length, sequence_declaration->length_name);
+       bt_append_scope_path(length, sequence_declaration->length_name);
 
-       declaration_ref(elem_declaration);
+       bt_declaration_ref(elem_declaration);
        sequence_declaration->elem = elem_declaration;
        sequence_declaration->scope = new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_SEQUENCE;
@@ -129,7 +138,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
        int ret;
 
        sequence = g_new(struct definition_sequence, 1);
-       declaration_ref(&sequence_declaration->p);
+       bt_declaration_ref(&sequence_declaration->p);
        sequence->p.declaration = declaration;
        sequence->declaration = sequence_declaration;
        sequence->p.ref = 1;
@@ -157,7 +166,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
                printf("[error] Sequence length field should be unsigned.\n");
                goto error;
        }
-       definition_ref(len_parent);
+       bt_definition_ref(len_parent);
 
        sequence->string = NULL;
        sequence->elems = NULL;
@@ -183,7 +192,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 
 error:
        free_definition_scope(sequence->p.scope);
-       declaration_unref(&sequence_declaration->p);
+       bt_declaration_unref(&sequence_declaration->p);
        g_free(sequence);
        return NULL;
 }
@@ -205,11 +214,11 @@ void _sequence_definition_free(struct definition *definition)
                        field = g_ptr_array_index(sequence->elems, i);
                        field->declaration->definition_free(field);
                }
+               (void) g_ptr_array_free(sequence->elems, TRUE);
        }
-       (void) g_ptr_array_free(sequence->elems, TRUE);
-       definition_unref(len_definition);
+       bt_definition_unref(len_definition);
        free_definition_scope(sequence->p.scope);
-       declaration_unref(sequence->p.declaration);
+       bt_declaration_unref(sequence->p.declaration);
        g_free(sequence);
 }