{
hb_font_callbacks_t *fcallbacks;
- fcallbacks = calloc (1, sizeof (hb_font_callbacks_t));
- if (!fcallbacks)
+ if (!HB_OBJECT_DO_CREATE (fcallbacks))
return &_hb_font_callbacks_nil;
- HB_OBJECT_DO_CREATE (fcallbacks);
-
return fcallbacks;
}
{
hb_font_callbacks_t *fcallbacks;
- fcallbacks = calloc (1, sizeof (hb_font_callbacks_t));
- if (!fcallbacks)
+ if (!HB_OBJECT_DO_CREATE (fcallbacks))
return &_hb_font_callbacks_nil;
*fcallbacks = *other_fcallbacks;
- HB_OBJECT_DO_CREATE (fcallbacks);
+
+ /* re-init refcount */
+ HB_OBJECT_DO_INIT (fcallbacks);
return fcallbacks;
}
{
hb_unicode_callbacks_t *ucallbacks;
- ucallbacks = calloc (1, sizeof (hb_unicode_callbacks_t));
- if (!ucallbacks)
+ if (!HB_OBJECT_DO_CREATE (ucallbacks))
return &_hb_unicode_callbacks_nil;
- HB_OBJECT_DO_CREATE (ucallbacks);
-
return ucallbacks;
}
{
hb_unicode_callbacks_t *ucallbacks;
- ucallbacks = calloc (1, sizeof (hb_unicode_callbacks_t));
- if (!ucallbacks)
+ if (!HB_OBJECT_DO_CREATE (ucallbacks))
return &_hb_unicode_callbacks_nil;
*ucallbacks = *other_ucallbacks;
- HB_OBJECT_DO_CREATE (ucallbacks);
+ HB_OBJECT_DO_INIT (ucallbacks);
return ucallbacks;
}
{
hb_face_t *face;
- face = calloc (1, sizeof (hb_face_t));
- if (!face)
+ if (!HB_OBJECT_DO_CREATE (face))
return &_hb_face_nil;
- HB_OBJECT_DO_CREATE (face);
-
face->blob = hb_blob_reference (blob);
face->index = index;
{
hb_face_t *face;
- face = calloc (1, sizeof (hb_face_t));
- if (!face) {
+ if (!HB_OBJECT_DO_CREATE (face)) {
if (destroy)
destroy (user_data);
return &_hb_face_nil;
}
- HB_OBJECT_DO_CREATE (face);
-
face->get_table = get_table;
face->destroy = destroy;
face->user_data = user_data;
{
hb_font_t *font;
- font = calloc (1, sizeof (hb_font_t));
- if (!font)
+ if (!HB_OBJECT_DO_CREATE (font))
return &_hb_font_nil;
- HB_OBJECT_DO_CREATE (font);
-
font->face = hb_face_reference (face);
return font;
#define HB_OBJECT_IS_INERT(obj) \
((obj) == NULL || HB_REFERENCE_COUNT_IS_INVALID ((obj)->ref_count))
-#define HB_OBJECT_DO_CREATE(obj) \
+#define HB_OBJECT_DO_INIT_EXPR(obj) \
+ HB_REFERENCE_COUNT_INIT (obj->ref_count, 1)
+
+#define HB_OBJECT_DO_INIT(obj) \
HB_STMT_START { \
- HB_REFERENCE_COUNT_INIT (obj->ref_count, 1); \
+ HB_OBJECT_DO_INIT_EXPR (obj); \
} HB_STMT_END
+#define HB_OBJECT_DO_CREATE(obj) \
+ HB_LIKELY (( \
+ (obj) = calloc (1, sizeof (*(obj))), \
+ HB_OBJECT_DO_INIT_EXPR (obj), \
+ (obj) \
+ ))
+
#define HB_OBJECT_DO_REFERENCE(obj) \
HB_STMT_START { \
if (HB_OBJECT_IS_INERT (obj)) \