namespace declaration_ref and declaration_unref

[babeltrace.git] / types / enum.c

diff --git a/types/enum.c b/types/enum.c
index f425df02badb89afae51dc29be98823241518453..2ea40ba482449885355ae3dd95f30476e6dc8cb6 100644 (file)
--- a/types/enum.c
+++ b/types/enum.c
@@ -16,6 +16,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 <babeltrace/compiler.h>
@@ -24,6 +32,14 @@
 #include <stdint.h>
 #include <glib.h>
 
+#if (__LONG_MAX__ == 2147483647L)
+#define WORD_SIZE      32
+#elif (__LONG_MAX__ == 9223372036854775807L)
+#define WORD_SIZE      64
+#else
+#error "Unknown long size."
+#endif
+
 static
 struct definition *_enum_definition_new(struct declaration *declaration,
                                        struct definition_scope *parent_scope,
@@ -38,7 +54,7 @@ void enum_range_set_free(void *ptr)
        g_array_unref(ptr);
 }
 
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
 static inline
 gpointer get_uint_v(uint64_t *v)
 {
@@ -73,7 +89,7 @@ void enum_val_free(void *ptr)
 {
        g_free(ptr);
 }
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
 static inline
 gpointer get_uint_v(uint64_t *v)
 {
@@ -102,7 +118,7 @@ static
 void enum_val_free(void *ptr)
 {
 }
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
 
 /*
  * Returns a GArray or NULL.
@@ -211,12 +227,12 @@ void enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_decla
                array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
                g_array_set_size(array, 1);
                g_array_index(array, GQuark, array->len - 1) = q;
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
                valuep = g_new(uint64_t, 1);
                *valuep = v;
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
                valuep = get_uint_v(&v);
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
                g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
        } else {
                g_array_set_size(array, array->len + 1);
@@ -237,12 +253,12 @@ void enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declara
                array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
                g_array_set_size(array, 1);
                g_array_index(array, GQuark, array->len - 1) = q;
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
                valuep = g_new(int64_t, 1);
                *valuep = v;
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
                valuep = get_int_v(&v);
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
                g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
        } else {
                g_array_set_size(array, array->len + 1);
@@ -370,7 +386,7 @@ void _enum_declaration_free(struct declaration *declaration)
                g_free(iter);
        }
        g_hash_table_destroy(enum_declaration->table.quark_to_range_set);
-       declaration_unref(&enum_declaration->integer_declaration->p);
+       bt_declaration_unref(&enum_declaration->integer_declaration->p);
        g_free(enum_declaration);
 }
 
@@ -389,7 +405,7 @@ struct declaration_enum *
        enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
                                                        g_direct_equal,
                                                        NULL, enum_range_set_free);
-       declaration_ref(&integer_declaration->p);
+       bt_declaration_ref(&integer_declaration->p);
        enum_declaration->integer_declaration = integer_declaration;
        enum_declaration->p.id = CTF_TYPE_ENUM;
        enum_declaration->p.alignment = 1;
@@ -414,7 +430,7 @@ struct definition *
        int ret;
 
        _enum = g_new(struct definition_enum, 1);
-       declaration_ref(&enum_declaration->p);
+       bt_declaration_ref(&enum_declaration->p);
        _enum->p.declaration = declaration;
        _enum->declaration = enum_declaration;
        _enum->p.ref = 1;
@@ -447,7 +463,7 @@ void _enum_definition_free(struct definition *definition)
 
        definition_unref(&_enum->integer->p);
        free_definition_scope(_enum->p.scope);
-       declaration_unref(_enum->p.declaration);
+       bt_declaration_unref(_enum->p.declaration);
        if (_enum->value)
                g_array_unref(_enum->value);
        g_free(_enum);