walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HB] Remove use of typeof()

This commit is contained in:
Behdad Esfahbod 2009-08-03 22:43:02 -04:00
parent 70e0f2a75e
commit 5fc22e647c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-blob.c
View File

@ -84,7 +84,7 @@ hb_blob_create (const char *data,
{ {
hb_blob_t *blob; hb_blob_t *blob;
if (!length || !HB_OBJECT_DO_CREATE (blob)) { if (!length || !HB_OBJECT_DO_CREATE (hb_blob_t, blob)) {
if (destroy) if (destroy)
destroy (user_data); destroy (user_data);
return &_hb_blob_nil; return &_hb_blob_nil;
@ -118,7 +118,7 @@ hb_blob_create_sub_blob (hb_blob_t *parent,
hb_blob_t *blob; hb_blob_t *blob;
const char *pdata; const char *pdata;
if (!length || offset >= parent->length || !HB_OBJECT_DO_CREATE (blob)) if (!length || offset >= parent->length || !HB_OBJECT_DO_CREATE (hb_blob_t, blob))
return &_hb_blob_nil; return &_hb_blob_nil;
pdata = hb_blob_lock (parent); pdata = hb_blob_lock (parent);

2
src/hb-buffer.c
View File

@ -78,7 +78,7 @@ hb_buffer_create (unsigned int pre_alloc_size)
{ {
hb_buffer_t *buffer; hb_buffer_t *buffer;
if (!HB_OBJECT_DO_CREATE (buffer)) if (!HB_OBJECT_DO_CREATE (hb_buffer_t, buffer))
return &_hb_buffer_nil; return &_hb_buffer_nil;
if (pre_alloc_size) if (pre_alloc_size)

14
src/hb-font.cc
View File

@ -51,7 +51,7 @@ hb_font_callbacks_create (void)
{ {
hb_font_callbacks_t *fcallbacks; hb_font_callbacks_t *fcallbacks;
if (!HB_OBJECT_DO_CREATE (fcallbacks)) if (!HB_OBJECT_DO_CREATE (hb_font_callbacks_t, fcallbacks))
return &_hb_font_callbacks_nil; return &_hb_font_callbacks_nil;
return fcallbacks; return fcallbacks;
@ -82,7 +82,7 @@ hb_font_callbacks_copy (hb_font_callbacks_t *other_fcallbacks)
{ {
hb_font_callbacks_t *fcallbacks; hb_font_callbacks_t *fcallbacks;
if (!HB_OBJECT_DO_CREATE (fcallbacks)) if (!HB_OBJECT_DO_CREATE (hb_font_callbacks_t, fcallbacks))
return &_hb_font_callbacks_nil; return &_hb_font_callbacks_nil;
*fcallbacks = *other_fcallbacks; *fcallbacks = *other_fcallbacks;
@ -115,7 +115,7 @@ hb_unicode_callbacks_create (void)
{ {
hb_unicode_callbacks_t *ucallbacks; hb_unicode_callbacks_t *ucallbacks;
if (!HB_OBJECT_DO_CREATE (ucallbacks)) if (!HB_OBJECT_DO_CREATE (hb_unicode_callbacks_t, ucallbacks))
return &_hb_unicode_callbacks_nil; return &_hb_unicode_callbacks_nil;
return ucallbacks; return ucallbacks;
@ -146,7 +146,7 @@ hb_unicode_callbacks_copy (hb_unicode_callbacks_t *other_ucallbacks)
{ {
hb_unicode_callbacks_t *ucallbacks; hb_unicode_callbacks_t *ucallbacks;
if (!HB_OBJECT_DO_CREATE (ucallbacks)) if (!HB_OBJECT_DO_CREATE (hb_unicode_callbacks_t, ucallbacks))
return &_hb_unicode_callbacks_nil; return &_hb_unicode_callbacks_nil;
*ucallbacks = *other_ucallbacks; *ucallbacks = *other_ucallbacks;
@ -211,7 +211,7 @@ hb_face_create_for_tables (hb_get_table_func_t get_table,
{ {
hb_face_t *face; hb_face_t *face;
if (!HB_OBJECT_DO_CREATE (face)) { if (!HB_OBJECT_DO_CREATE (hb_face_t, face)) {
if (destroy) if (destroy)
destroy (user_data); destroy (user_data);
return &_hb_face_nil; return &_hb_face_nil;
@ -232,7 +232,7 @@ hb_face_create_for_data (hb_blob_t *blob,
{ {
hb_face_t *face; hb_face_t *face;
if (!HB_OBJECT_DO_CREATE (face)) if (!HB_OBJECT_DO_CREATE (hb_face_t, face))
return &_hb_face_nil; return &_hb_face_nil;
face->blob = hb_blob_reference (blob); face->blob = hb_blob_reference (blob);
@ -331,7 +331,7 @@ hb_font_create (hb_face_t *face)
{ {
hb_font_t *font; hb_font_t *font;
if (!HB_OBJECT_DO_CREATE (font)) if (!HB_OBJECT_DO_CREATE (hb_font_t, font))
return &_hb_font_nil; return &_hb_font_nil;
font->face = hb_face_reference (face); font->face = hb_face_reference (face);

4
src/hb-object-private.h
View File

@ -73,9 +73,9 @@ typedef struct {
HB_OBJECT_DO_INIT_EXPR (obj); \ HB_OBJECT_DO_INIT_EXPR (obj); \
} HB_STMT_END } HB_STMT_END
#define HB_OBJECT_DO_CREATE(obj) \ #define HB_OBJECT_DO_CREATE(Type, obj) \
HB_LIKELY (( \ HB_LIKELY (( \
(obj) = /* XXX */(typeof (obj)) calloc (1, sizeof (*(obj))), \ (obj) = (Type *) calloc (1, sizeof (Type)), \
HB_OBJECT_DO_INIT_EXPR (obj), \ HB_OBJECT_DO_INIT_EXPR (obj), \
(obj) \ (obj) \
)) ))