Skip to content

Commit 1a2b4f9

Browse files
committed
filterx/filterx-object: inline filterx_object_ref/unref()
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
1 parent ee9eb41 commit 1a2b4f9

File tree

2 files changed

+31
-33
lines changed

2 files changed

+31
-33
lines changed

lib/filterx/filterx-object.c

-31
Original file line numberDiff line numberDiff line change
@@ -131,37 +131,6 @@ filterx_object_unfreeze_and_free(FilterXObject *self)
131131
filterx_object_unref(self);
132132
}
133133

134-
FilterXObject *
135-
filterx_object_ref(FilterXObject *self)
136-
{
137-
if (!self)
138-
return NULL;
139-
140-
if (filterx_object_is_frozen(self))
141-
return self;
142-
143-
g_atomic_counter_inc(&self->ref_cnt);
144-
145-
return self;
146-
}
147-
148-
void
149-
filterx_object_unref(FilterXObject *self)
150-
{
151-
if (!self)
152-
return;
153-
154-
if (filterx_object_is_frozen(self))
155-
return;
156-
157-
g_assert(g_atomic_counter_get(&self->ref_cnt) > 0);
158-
if (g_atomic_counter_dec_and_test(&self->ref_cnt))
159-
{
160-
self->type->free_fn(self);
161-
g_free(self);
162-
}
163-
}
164-
165134
FilterXType FILTERX_TYPE_NAME(object) =
166135
{
167136
.super_type = NULL,

lib/filterx/filterx-object.h

+31-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ FilterXObject *filterx_object_getattr_string(FilterXObject *self, const gchar *a
102102
gboolean filterx_object_setattr_string(FilterXObject *self, const gchar *attr_name, FilterXObject **new_value);
103103

104104
FilterXObject *filterx_object_new(FilterXType *type);
105-
FilterXObject *filterx_object_ref(FilterXObject *self);
106-
void filterx_object_unref(FilterXObject *self);
107105
gboolean filterx_object_freeze(FilterXObject *self);
108106
void filterx_object_unfreeze_and_free(FilterXObject *self);
109107
void filterx_object_init_instance(FilterXObject *self, FilterXType *type);
@@ -115,6 +113,37 @@ filterx_object_is_frozen(FilterXObject *self)
115113
return g_atomic_counter_get(&self->ref_cnt) == FILTERX_OBJECT_MAGIC_BIAS;
116114
}
117115

116+
static inline FilterXObject *
117+
filterx_object_ref(FilterXObject *self)
118+
{
119+
if (!self)
120+
return NULL;
121+
122+
if (filterx_object_is_frozen(self))
123+
return self;
124+
125+
g_atomic_counter_inc(&self->ref_cnt);
126+
127+
return self;
128+
}
129+
130+
static inline void
131+
filterx_object_unref(FilterXObject *self)
132+
{
133+
if (!self)
134+
return;
135+
136+
if (filterx_object_is_frozen(self))
137+
return;
138+
139+
g_assert(g_atomic_counter_get(&self->ref_cnt) > 0);
140+
if (g_atomic_counter_dec_and_test(&self->ref_cnt))
141+
{
142+
self->type->free_fn(self);
143+
g_free(self);
144+
}
145+
}
146+
118147
static inline void
119148
filterx_object_make_readonly(FilterXObject *self)
120149
{

0 commit comments

Comments
 (0)