From 33d13fdda99acaeffa9600737e8870278d053ebe Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 29 Apr 2010 13:56:44 -0400 Subject: [PATCH] Rename HB_GNUC_UNUSED -> HB_UNUSED --- src/hb-buffer.c | 6 ++-- src/hb-font.cc | 44 ++++++++++++++-------------- src/hb-ft.c | 16 +++++----- src/hb-object-private.h | 2 +- src/hb-open-type-private.hh | 18 ++++++------ src/hb-ot-layout-gdef-private.hh | 4 +-- src/hb-ot-layout-gpos-private.hh | 4 +-- src/hb-ot-layout-gsubgpos-private.hh | 6 ++-- src/hb-ot-layout.cc | 4 +-- src/hb-ot-shape.c | 2 +- src/hb-private.h | 16 +++++----- src/hb-shape.c | 32 ++++++++++---------- src/hb-unicode.c | 8 ++--- 13 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/hb-buffer.c b/src/hb-buffer.c index 777ee7f49..f169c3574 100644 --- a/src/hb-buffer.c +++ b/src/hb-buffer.c @@ -594,7 +594,7 @@ hb_utf8_next (const uint8_t *text, void hb_buffer_add_utf8 (hb_buffer_t *buffer, const char *text, - unsigned int text_length HB_GNUC_UNUSED, + unsigned int text_length HB_UNUSED, unsigned int item_offset, unsigned int item_length) { @@ -628,7 +628,7 @@ hb_utf16_next (const uint16_t *text, void hb_buffer_add_utf16 (hb_buffer_t *buffer, const uint16_t *text, - unsigned int text_length HB_GNUC_UNUSED, + unsigned int text_length HB_UNUSED, unsigned int item_offset, unsigned int item_length) { @@ -640,7 +640,7 @@ hb_buffer_add_utf16 (hb_buffer_t *buffer, void hb_buffer_add_utf32 (hb_buffer_t *buffer, const uint32_t *text, - unsigned int text_length HB_GNUC_UNUSED, + unsigned int text_length HB_UNUSED, unsigned int item_offset, unsigned int item_length) { diff --git a/src/hb-font.cc b/src/hb-font.cc index d0d58f1fb..a17cab5f7 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -40,37 +40,37 @@ */ static hb_codepoint_t -hb_font_get_glyph_nil (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - const void *user_data HB_GNUC_UNUSED, - hb_codepoint_t unicode HB_GNUC_UNUSED, - hb_codepoint_t variation_selector HB_GNUC_UNUSED) +hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + const void *user_data HB_UNUSED, + hb_codepoint_t unicode HB_UNUSED, + hb_codepoint_t variation_selector HB_UNUSED) { return 0; } static hb_bool_t -hb_font_get_contour_point_nil (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - const void *user_data HB_GNUC_UNUSED, - unsigned int point_index HB_GNUC_UNUSED, - hb_codepoint_t glyph HB_GNUC_UNUSED, - hb_position_t *x HB_GNUC_UNUSED, - hb_position_t *y HB_GNUC_UNUSED) +hb_font_get_contour_point_nil (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + const void *user_data HB_UNUSED, + unsigned int point_index HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_position_t *x HB_UNUSED, + hb_position_t *y HB_UNUSED) { return false; } static void -hb_font_get_glyph_metrics_nil (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - const void *user_data HB_GNUC_UNUSED, - hb_codepoint_t glyph HB_GNUC_UNUSED, - hb_glyph_metrics_t *metrics HB_GNUC_UNUSED) +hb_font_get_glyph_metrics_nil (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + const void *user_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_glyph_metrics_t *metrics HB_UNUSED) { } static hb_position_t -hb_font_get_kerning_nil (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - const void *user_data HB_GNUC_UNUSED, - hb_codepoint_t first_glyph HB_GNUC_UNUSED, - hb_codepoint_t second_glyph HB_GNUC_UNUSED) +hb_font_get_kerning_nil (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + const void *user_data HB_UNUSED, + hb_codepoint_t first_glyph HB_UNUSED, + hb_codepoint_t second_glyph HB_UNUSED) { return 0; } hb_font_funcs_t _hb_font_funcs_nil = { diff --git a/src/hb-ft.c b/src/hb-ft.c index 3e91eff16..2174da5bc 100644 --- a/src/hb-ft.c +++ b/src/hb-ft.c @@ -34,8 +34,8 @@ #include FT_TRUETYPE_TABLES_H static hb_codepoint_t -hb_ft_get_glyph (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, +hb_ft_get_glyph (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, const void *user_data, hb_codepoint_t unicode, hb_codepoint_t variation_selector) @@ -54,8 +54,8 @@ hb_ft_get_glyph (hb_font_t *font HB_GNUC_UNUSED, } static hb_bool_t -hb_ft_get_contour_point (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, +hb_ft_get_contour_point (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, const void *user_data, unsigned int point_index, hb_codepoint_t glyph, @@ -83,8 +83,8 @@ hb_ft_get_contour_point (hb_font_t *font HB_GNUC_UNUSED, } static void -hb_ft_get_glyph_metrics (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, +hb_ft_get_glyph_metrics (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, const void *user_data, hb_codepoint_t glyph, hb_glyph_metrics_t *metrics) @@ -110,8 +110,8 @@ hb_ft_get_glyph_metrics (hb_font_t *font HB_GNUC_UNUSED, } static hb_position_t -hb_ft_get_kerning (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, +hb_ft_get_kerning (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, const void *user_data, hb_codepoint_t first_glyph, hb_codepoint_t second_glyph) diff --git a/src/hb-object-private.h b/src/hb-object-private.h index e24bc91dc..937b1df93 100644 --- a/src/hb-object-private.h +++ b/src/hb-object-private.h @@ -62,7 +62,7 @@ typedef struct { #define HB_DEBUG_OBJECT HB_DEBUG+0 #endif -static HB_GNUC_UNUSED inline hb_bool_t /* always returns TRUE */ +static HB_UNUSED inline hb_bool_t /* always returns TRUE */ _hb_object_debug_out (const void *obj, hb_reference_count_t *ref_count, const char *function) diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index f59629f22..bbd88a73d 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -133,7 +133,7 @@ ASSERT_STATIC (sizeof (Type) + 1 <= sizeof (_Null##Type)) #define SANITIZE_ARG_DEF \ hb_sanitize_context_t *context, \ - unsigned int sanitize_depth HB_GNUC_UNUSED + unsigned int sanitize_depth HB_UNUSED #define SANITIZE_ARG \ context, \ (HB_DEBUG_SANITIZE ? sanitize_depth + 1 : 0) @@ -146,7 +146,7 @@ struct hb_sanitize_context_t }; -static HB_GNUC_UNUSED void +static HB_UNUSED void _hb_sanitize_init (hb_sanitize_context_t *context, hb_blob_t *blob) { @@ -160,8 +160,8 @@ _hb_sanitize_init (hb_sanitize_context_t *context, blob, context->start, context->end, context->end - context->start); } -static HB_GNUC_UNUSED void -_hb_sanitize_fini (hb_sanitize_context_t *context HB_GNUC_UNUSED, +static HB_UNUSED void +_hb_sanitize_fini (hb_sanitize_context_t *context HB_UNUSED, hb_blob_t *blob) { if (HB_DEBUG_SANITIZE) @@ -171,7 +171,7 @@ _hb_sanitize_fini (hb_sanitize_context_t *context HB_GNUC_UNUSED, hb_blob_unlock (blob); } -static HB_GNUC_UNUSED inline bool +static HB_UNUSED inline bool _hb_sanitize_check (SANITIZE_ARG_DEF, const char *base, unsigned int len) @@ -191,7 +191,7 @@ _hb_sanitize_check (SANITIZE_ARG_DEF, return ret; } -static HB_GNUC_UNUSED inline bool +static HB_UNUSED inline bool _hb_sanitize_array (SANITIZE_ARG_DEF, const char *base, unsigned int record_size, @@ -211,10 +211,10 @@ _hb_sanitize_array (SANITIZE_ARG_DEF, return HB_LIKELY (!overflows) && _hb_sanitize_check (SANITIZE_ARG, base, record_size * len); } -static HB_GNUC_UNUSED inline bool +static HB_UNUSED inline bool _hb_sanitize_edit (SANITIZE_ARG_DEF, - const char *base HB_GNUC_UNUSED, - unsigned int len HB_GNUC_UNUSED) + const char *base HB_UNUSED, + unsigned int len HB_UNUSED) { context->edit_count++; diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh index e85b57819..a2eed5b22 100644 --- a/src/hb-ot-layout-gdef-private.hh +++ b/src/hb-ot-layout-gdef-private.hh @@ -91,7 +91,7 @@ struct CaretValueFormat1 friend struct CaretValue; private: - inline int get_caret_value (hb_ot_layout_context_t *context, hb_codepoint_t glyph_id HB_GNUC_UNUSED) const + inline int get_caret_value (hb_ot_layout_context_t *context, hb_codepoint_t glyph_id HB_UNUSED) const { /* TODO vertical */ return _hb_16dot16_mul_round (context->font->x_scale, coordinate); @@ -138,7 +138,7 @@ struct CaretValueFormat3 { friend struct CaretValue; - inline int get_caret_value (hb_ot_layout_context_t *context, hb_codepoint_t glyph_id HB_GNUC_UNUSED) const + inline int get_caret_value (hb_ot_layout_context_t *context, hb_codepoint_t glyph_id HB_UNUSED) const { /* TODO vertical */ return _hb_16dot16_mul_round (context->font->x_scale, coordinate) + diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh index 07c411751..c13969235 100644 --- a/src/hb-ot-layout-gpos-private.hh +++ b/src/hb-ot-layout-gpos-private.hh @@ -194,7 +194,7 @@ struct AnchorFormat1 friend struct Anchor; private: - inline void get_anchor (hb_ot_layout_context_t *layout_context, hb_codepoint_t glyph_id HB_GNUC_UNUSED, + inline void get_anchor (hb_ot_layout_context_t *layout_context, hb_codepoint_t glyph_id HB_UNUSED, hb_position_t *x, hb_position_t *y) const { *x = _hb_16dot16_mul_round (layout_context->font->x_scale, xCoordinate); @@ -250,7 +250,7 @@ struct AnchorFormat3 friend struct Anchor; private: - inline void get_anchor (hb_ot_layout_context_t *layout_context, hb_codepoint_t glyph_id HB_GNUC_UNUSED, + inline void get_anchor (hb_ot_layout_context_t *layout_context, hb_codepoint_t glyph_id HB_UNUSED, hb_position_t *x, hb_position_t *y) const { *x = _hb_16dot16_mul_round (layout_context->font->x_scale, xCoordinate); diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index f6a03d613..50126b485 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -46,8 +46,8 @@ hb_apply_context_t *context, \ hb_ot_layout_context_t *layout_context, \ hb_buffer_t *buffer, \ - unsigned int context_length HB_GNUC_UNUSED, \ - unsigned int apply_depth HB_GNUC_UNUSED + unsigned int context_length HB_UNUSED, \ + unsigned int apply_depth HB_UNUSED #define APPLY_ARG \ context, \ layout_context, \ @@ -73,7 +73,7 @@ struct ContextFuncs }; -static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const char *data HB_GNUC_UNUSED) +static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const char *data HB_UNUSED) { return glyph_id == value; } diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 757722b58..a450046fd 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -595,8 +595,8 @@ hb_ot_layout_position_lookup (hb_font_t *font, } void -hb_ot_layout_position_finish (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, +hb_ot_layout_position_finish (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, hb_buffer_t *buffer) { unsigned int i, j; diff --git a/src/hb-ot-shape.c b/src/hb-ot-shape.c index 54d2895ad..7ff8166a0 100644 --- a/src/hb-ot-shape.c +++ b/src/hb-ot-shape.c @@ -114,7 +114,7 @@ setup_lookups (hb_face_t *face, hb_bool_t -_hb_ot_substitute_complex (hb_font_t *font HB_GNUC_UNUSED, +_hb_ot_substitute_complex (hb_font_t *font HB_UNUSED, hb_face_t *face, hb_buffer_t *buffer, hb_feature_t *features, diff --git a/src/hb-private.h b/src/hb-private.h index 1ad094c60..9130b0464 100644 --- a/src/hb-private.h +++ b/src/hb-private.h @@ -117,16 +117,16 @@ #endif #if __GNUC__ >= 3 -#define HB_GNUC_PURE __attribute__((pure)) -#define HB_GNUC_CONST __attribute__((const)) +#define HB_PURE_FUNC __attribute__((pure)) +#define HB_CONST_FUNC __attribute__((const)) #else -#define HB_GNUC_PURE -#define HB_GNUC_CONST +#define HB_PURE_FUNC +#define HB_CONST_FUNC #endif #if __GNUC__ >= 4 -#define HB_GNUC_UNUSED __attribute__((unused)) +#define HB_UNUSED __attribute__((unused)) #else -#define HB_GNUC_UNUSED +#define HB_UNUSED #endif @@ -161,7 +161,7 @@ * in libgcc in case a target does not have one, which should be just as * good as the open-coded solution below, (which is "HACKMEM 169"). */ -static HB_GNUC_UNUSED inline unsigned int +static HB_UNUSED inline unsigned int _hb_popcount32 (uint32_t mask) { #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) @@ -240,7 +240,7 @@ typedef int hb_mutex_t; #define HB_DEBUG 0 #endif -static HB_GNUC_UNUSED inline hb_bool_t /* always returns TRUE */ +static HB_UNUSED inline hb_bool_t /* always returns TRUE */ _hb_trace (const char *what, const char *function, const void *obj, diff --git a/src/hb-shape.c b/src/hb-shape.c index 2e4f3f691..89c011795 100644 --- a/src/hb-shape.c +++ b/src/hb-shape.c @@ -113,8 +113,8 @@ static void hb_substitute_default (hb_font_t *font, hb_face_t *face, hb_buffer_t *buffer, - hb_feature_t *features HB_GNUC_UNUSED, - unsigned int num_features HB_GNUC_UNUSED) + hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) { hb_mirror_chars (buffer); hb_map_glyphs (font, face, buffer); @@ -131,11 +131,11 @@ hb_substitute_complex (hb_font_t *font, } static void -hb_substitute_fallback (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - hb_buffer_t *buffer HB_GNUC_UNUSED, - hb_feature_t *features HB_GNUC_UNUSED, - unsigned int num_features HB_GNUC_UNUSED) +hb_substitute_fallback (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + hb_buffer_t *buffer HB_UNUSED, + hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) { /* TODO Arabic */ } @@ -147,8 +147,8 @@ static void hb_position_default (hb_font_t *font, hb_face_t *face, hb_buffer_t *buffer, - hb_feature_t *features HB_GNUC_UNUSED, - unsigned int num_features HB_GNUC_UNUSED) + hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) { unsigned int count; @@ -174,11 +174,11 @@ hb_position_complex (hb_font_t *font, } static void -hb_position_fallback (hb_font_t *font HB_GNUC_UNUSED, - hb_face_t *face HB_GNUC_UNUSED, - hb_buffer_t *buffer HB_GNUC_UNUSED, - hb_feature_t *features HB_GNUC_UNUSED, - unsigned int num_features HB_GNUC_UNUSED) +hb_position_fallback (hb_font_t *font HB_UNUSED, + hb_face_t *face HB_UNUSED, + hb_buffer_t *buffer HB_UNUSED, + hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) { /* TODO Mark pos */ } @@ -187,8 +187,8 @@ static void hb_truetype_kern (hb_font_t *font, hb_face_t *face, hb_buffer_t *buffer, - hb_feature_t *features HB_GNUC_UNUSED, - unsigned int num_features HB_GNUC_UNUSED) + hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) { unsigned int count; diff --git a/src/hb-unicode.c b/src/hb-unicode.c index b6bd4ba2d..b75fe7e99 100644 --- a/src/hb-unicode.c +++ b/src/hb-unicode.c @@ -33,10 +33,10 @@ */ static hb_codepoint_t hb_unicode_get_mirroring_nil (hb_codepoint_t unicode) { return unicode; } -static hb_category_t hb_unicode_get_general_category_nil (hb_codepoint_t unicode HB_GNUC_UNUSED) { return HB_CATEGORY_OTHER_LETTER; } -static hb_script_t hb_unicode_get_script_nil (hb_codepoint_t unicode HB_GNUC_UNUSED) { return HB_SCRIPT_UNKNOWN; } -static unsigned int hb_unicode_get_combining_class_nil (hb_codepoint_t unicode HB_GNUC_UNUSED) { return 0; } -static unsigned int hb_unicode_get_eastasian_width_nil (hb_codepoint_t unicode HB_GNUC_UNUSED) { return 1; } +static hb_category_t hb_unicode_get_general_category_nil (hb_codepoint_t unicode HB_UNUSED) { return HB_CATEGORY_OTHER_LETTER; } +static hb_script_t hb_unicode_get_script_nil (hb_codepoint_t unicode HB_UNUSED) { return HB_SCRIPT_UNKNOWN; } +static unsigned int hb_unicode_get_combining_class_nil (hb_codepoint_t unicode HB_UNUSED) { return 0; } +static unsigned int hb_unicode_get_eastasian_width_nil (hb_codepoint_t unicode HB_UNUSED) { return 1; } hb_unicode_funcs_t _hb_unicode_funcs_nil = { HB_REFERENCE_COUNT_INVALID, /* ref_count */