X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=615ab708ddb734a70a97e05ec1140f8e2b61bf1e;hp=3ffe7e2f1b83d0e92efb5d2796f15406ccaf9b98;hb=c8c981321e028ae65247badf220f6106fa106cb7;hpb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7 diff --git a/types/types.c b/types/types.c index 3ffe7e2f..615ab708 100644 --- a/types/types.c +++ b/types/types.c @@ -18,6 +18,14 @@ * * 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 @@ -79,7 +87,7 @@ int register_declaration(GQuark name, struct declaration *declaration, g_hash_table_insert(scope->typedef_declarations, (gpointer) (unsigned long) name, declaration); - declaration_ref(declaration); + bt_declaration_ref(declaration); return 0; } @@ -271,12 +279,12 @@ int register_field_definition(GQuark field_name, struct definition *definition, return 0; } -void declaration_ref(struct declaration *declaration) +void bt_declaration_ref(struct declaration *declaration) { declaration->ref++; } -void declaration_unref(struct declaration *declaration) +void bt_declaration_unref(struct declaration *declaration) { if (!declaration) return; @@ -284,12 +292,12 @@ void declaration_unref(struct declaration *declaration) declaration->declaration_free(declaration); } -void definition_ref(struct definition *definition) +void bt_definition_ref(struct definition *definition) { definition->ref++; } -void definition_unref(struct definition *definition) +void bt_definition_unref(struct definition *definition) { if (!definition) return; @@ -304,16 +312,16 @@ struct declaration_scope * scope->typedef_declarations = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) declaration_unref); + (GDestroyNotify) bt_declaration_unref); scope->struct_declarations = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) declaration_unref); + (GDestroyNotify) bt_declaration_unref); scope->variant_declarations = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) declaration_unref); + (GDestroyNotify) bt_declaration_unref); scope->enum_declarations = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) declaration_unref); + (GDestroyNotify) bt_declaration_unref); scope->parent_scope = parent_scope; return scope; } @@ -328,20 +336,20 @@ void free_declaration_scope(struct declaration_scope *scope) } static -struct declaration_struct *lookup_struct_declaration_scope(GQuark struct_name, +struct declaration_struct *bt_lookup_struct_declaration_scope(GQuark struct_name, struct declaration_scope *scope) { return g_hash_table_lookup(scope->struct_declarations, (gconstpointer) (unsigned long) struct_name); } -struct declaration_struct *lookup_struct_declaration(GQuark struct_name, +struct declaration_struct *bt_lookup_struct_declaration(GQuark struct_name, struct declaration_scope *scope) { struct declaration_struct *declaration; while (scope) { - declaration = lookup_struct_declaration_scope(struct_name, scope); + declaration = bt_lookup_struct_declaration_scope(struct_name, scope); if (declaration) return declaration; scope = scope->parent_scope; @@ -349,7 +357,7 @@ struct declaration_struct *lookup_struct_declaration(GQuark struct_name, return NULL; } -int register_struct_declaration(GQuark struct_name, +int bt_register_struct_declaration(GQuark struct_name, struct declaration_struct *struct_declaration, struct declaration_scope *scope) { @@ -360,13 +368,13 @@ int register_struct_declaration(GQuark struct_name, return -EPERM; /* Only lookup in local scope */ - if (lookup_struct_declaration_scope(struct_name, scope)) + if (bt_lookup_struct_declaration_scope(struct_name, scope)) return -EEXIST; g_hash_table_insert(scope->struct_declarations, (gpointer) (unsigned long) struct_name, struct_declaration); - declaration_ref(&struct_declaration->p); + bt_declaration_ref(&struct_declaration->p); /* Also add in typedef/typealias scopes */ prefix_name = prefix_quark("struct ", struct_name); @@ -416,7 +424,7 @@ int register_variant_declaration(GQuark variant_name, g_hash_table_insert(scope->variant_declarations, (gpointer) (unsigned long) variant_name, untagged_variant_declaration); - declaration_ref(&untagged_variant_declaration->p); + bt_declaration_ref(&untagged_variant_declaration->p); /* Also add in typedef/typealias scopes */ prefix_name = prefix_quark("variant ", variant_name); @@ -467,7 +475,7 @@ int register_enum_declaration(GQuark enum_name, g_hash_table_insert(scope->enum_declarations, (gpointer) (unsigned long) enum_name, enum_declaration); - declaration_ref(&enum_declaration->p); + bt_declaration_ref(&enum_declaration->p); /* Also add in typedef/typealias scopes */ prefix_name = prefix_quark("enum ", enum_name); @@ -539,7 +547,7 @@ struct definition_scope * if (root_name) { scope = _new_definition_scope(parent_scope, 0); - append_scope_path(root_name, scope->scope_path); + bt_append_scope_path(root_name, scope->scope_path); } else { int scope_path_len = 1; @@ -566,7 +574,7 @@ struct definition_scope * /* * in: path (dot separated), out: q (GArray of GQuark) */ -void append_scope_path(const char *path, GArray *q) +void bt_append_scope_path(const char *path, GArray *q) { const char *ptrbegin, *ptrend = path; GQuark quark; @@ -634,7 +642,7 @@ struct definition_integer *lookup_integer(const struct definition *definition, return lookup_integer; } -struct definition_enum *lookup_enum(const struct definition *definition, +struct definition_enum *bt_lookup_enum(const struct definition *definition, const char *field_name, int signedness) {