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

[test] Fix -Wunused-parameter warnings

This commit is contained in:
Behdad Esfahbod 2018-09-30 18:14:50 +02:00
parent be0b2ed316
commit dcfcb950b8
8 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/api/hb-test.h
View File

@ -42,6 +42,7 @@ HB_BEGIN_DECLS
/* Just in case */ /* Just in case */
#undef G_DISABLE_ASSERT #undef G_DISABLE_ASSERT
#define HB_UNUSED G_GNUC_UNUSED
/* Misc */ /* Misc */

2
test/api/test-blob.c
View File

@ -195,7 +195,7 @@ fixture_init (fixture_t *fixture, gconstpointer user_data)
} }
static void static void
fixture_finish (fixture_t *fixture, gconstpointer user_data) fixture_finish (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
{ {
hb_blob_destroy (fixture->blob); hb_blob_destroy (fixture->blob);
g_assert_cmpint (fixture->freed, ==, 1); g_assert_cmpint (fixture->freed, ==, 1);

2
test/api/test-c.c
View File

@ -58,7 +58,7 @@
#endif #endif
int int
main (int argc, char **argv) main (void)
{ {
return !*hb_shape_list_shapers (); return !*hb_shape_list_shapers ();
} }

16
test/api/test-font.c
View File

@ -83,7 +83,7 @@ free_up (void *user_data)
} }
static hb_blob_t * static hb_blob_t *
get_table (hb_face_t *face, hb_tag_t tag, void *user_data) get_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data HB_UNUSED)
{ {
if (tag == HB_TAG ('a','b','c','d')) if (tag == HB_TAG ('a','b','c','d'))
return hb_blob_create (test_data, sizeof (test_data), HB_MEMORY_MODE_READONLY, NULL, NULL); return hb_blob_create (test_data, sizeof (test_data), HB_MEMORY_MODE_READONLY, NULL, NULL);
@ -210,10 +210,10 @@ test_fontfuncs_nil (void)
} }
static hb_bool_t static hb_bool_t
contour_point_func1 (hb_font_t *font, void *font_data, contour_point_func1 (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t glyph, unsigned int point_index, hb_codepoint_t glyph, unsigned int point_index HB_UNUSED,
hb_position_t *x, hb_position_t *y, hb_position_t *x, hb_position_t *y,
void *user_data) void *user_data HB_UNUSED)
{ {
if (glyph == 1) { if (glyph == 1) {
*x = 2; *x = 2;
@ -230,10 +230,10 @@ contour_point_func1 (hb_font_t *font, void *font_data,
} }
static hb_bool_t static hb_bool_t
contour_point_func2 (hb_font_t *font, void *font_data, contour_point_func2 (hb_font_t *font, void *font_data HB_UNUSED,
hb_codepoint_t glyph, unsigned int point_index, hb_codepoint_t glyph, unsigned int point_index,
hb_position_t *x, hb_position_t *y, hb_position_t *x, hb_position_t *y,
void *user_data) void *user_data HB_UNUSED)
{ {
if (glyph == 1) { if (glyph == 1) {
*x = 6; *x = 6;
@ -246,9 +246,9 @@ contour_point_func2 (hb_font_t *font, void *font_data,
} }
static hb_position_t static hb_position_t
glyph_h_advance_func1 (hb_font_t *font, void *font_data, glyph_h_advance_func1 (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t glyph, hb_codepoint_t glyph,
void *user_data) void *user_data HB_UNUSED)
{ {
if (glyph == 1) if (glyph == 1)
return 8; return 8;

2
test/api/test-multithread.c
View File

@ -101,7 +101,7 @@ thread_func (void *data)
return 0; return 0;
} }
void static void
test_body (void) test_body (void)
{ {
int i; int i;

2
test/api/test-ot-color.c
View File

@ -99,6 +99,7 @@ static hb_face_t *cpal_v0 = NULL;
static hb_face_t *cpal_v1 = NULL; static hb_face_t *cpal_v1 = NULL;
#if 0
#define assert_color_rgba(colors, i, r, g, b, a) G_STMT_START { \ #define assert_color_rgba(colors, i, r, g, b, a) G_STMT_START { \
const hb_ot_color_t *_colors = (colors); \ const hb_ot_color_t *_colors = (colors); \
const size_t _i = (i); \ const size_t _i = (i); \
@ -122,7 +123,6 @@ static hb_face_t *cpal_v1 = NULL;
} G_STMT_END } G_STMT_END
#if 0
static void static void
test_hb_ot_color_get_palette_count (void) test_hb_ot_color_get_palette_count (void)
{ {

14
test/api/test-shape.c
View File

@ -41,9 +41,9 @@
static const char test_data[] = "test\0data"; static const char test_data[] = "test\0data";
static hb_position_t static hb_position_t
glyph_h_advance_func (hb_font_t *font, void *font_data, glyph_h_advance_func (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t glyph, hb_codepoint_t glyph,
void *user_data) void *user_data HB_UNUSED)
{ {
switch (glyph) { switch (glyph) {
case 1: return 10; case 1: return 10;
@ -54,10 +54,10 @@ glyph_h_advance_func (hb_font_t *font, void *font_data,
} }
static hb_bool_t static hb_bool_t
glyph_func (hb_font_t *font, void *font_data, glyph_func (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t variant_selector, hb_codepoint_t unicode, hb_codepoint_t variation_selector HB_UNUSED,
hb_codepoint_t *glyph, hb_codepoint_t *glyph,
void *user_data) void *user_data HB_UNUSED)
{ {
switch (unicode) { switch (unicode) {
case 'T': *glyph = 1; return TRUE; case 'T': *glyph = 1; return TRUE;
@ -68,9 +68,9 @@ glyph_func (hb_font_t *font, void *font_data,
} }
static hb_position_t static hb_position_t
glyph_h_kerning_func (hb_font_t *font, void *font_data, glyph_h_kerning_func (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t left, hb_codepoint_t right, hb_codepoint_t left, hb_codepoint_t right,
void *user_data) void *user_data HB_UNUSED)
{ {
if (left == 1 && right == 2) if (left == 1 && right == 2)
return -2; return -2;

10
test/api/test-unicode.c
View File

@ -645,18 +645,18 @@ typedef struct {
} data_fixture_t; } data_fixture_t;
static void static void
data_fixture_init (data_fixture_t *f, gconstpointer user_data) data_fixture_init (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
{ {
f->data[0].value = MAGIC0; f->data[0].value = MAGIC0;
f->data[1].value = MAGIC1; f->data[1].value = MAGIC1;
} }
static void static void
data_fixture_finish (data_fixture_t *f, gconstpointer user_data) data_fixture_finish (data_fixture_t *f HB_UNUSED, gconstpointer user_data HB_UNUSED)
{ {
} }
static void static void
test_unicode_subclassing_nil (data_fixture_t *f, gconstpointer user_data) test_unicode_subclassing_nil (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
{ {
hb_unicode_funcs_t *uf, *aa; hb_unicode_funcs_t *uf, *aa;
@ -678,7 +678,7 @@ test_unicode_subclassing_nil (data_fixture_t *f, gconstpointer user_data)
} }
static void static void
test_unicode_subclassing_default (data_fixture_t *f, gconstpointer user_data) test_unicode_subclassing_default (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
{ {
hb_unicode_funcs_t *uf, *aa; hb_unicode_funcs_t *uf, *aa;
@ -697,7 +697,7 @@ test_unicode_subclassing_default (data_fixture_t *f, gconstpointer user_data)
} }
static void static void
test_unicode_subclassing_deep (data_fixture_t *f, gconstpointer user_data) test_unicode_subclassing_deep (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
{ {
hb_unicode_funcs_t *uf, *aa; hb_unicode_funcs_t *uf, *aa;