avoid clashing with remove(3) prototype

This commit is contained in:
Nils Philippsen
2016-07-31 20:48:42 +02:00
parent 99a22418b9
commit 454c60970f

View File

@ -29,7 +29,7 @@
GimpTestFixture, \ GimpTestFixture, \
NULL, \ NULL, \
gimp_test_id_table_setup, \ gimp_test_id_table_setup, \
function, \ gimp_test_id_ ## function, \
gimp_test_id_table_teardown); gimp_test_id_table_teardown);
@ -59,13 +59,13 @@ gimp_test_id_table_teardown (GimpTestFixture *fixture,
} }
/** /**
* insert_and_lookup: * gimp_test_id_insert_and_lookup:
* *
* Test that insert and lookup works. * Test that insert and lookup works.
**/ **/
static void static void
insert_and_lookup (GimpTestFixture *f, gimp_test_id_insert_and_lookup (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
gint ret_id = gimp_id_table_insert (f->id_table, data1); gint ret_id = gimp_id_table_insert (f->id_table, data1);
gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id); gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
@ -74,13 +74,13 @@ insert_and_lookup (GimpTestFixture *f,
} }
/** /**
* insert_twice: * gimp_test_id_insert_twice:
* *
* Test that two consecutive inserts generates different IDs. * Test that two consecutive inserts generates different IDs.
**/ **/
static void static void
insert_twice (GimpTestFixture *f, gimp_test_id_insert_twice (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
gint ret_id = gimp_id_table_insert (f->id_table, data1); gint ret_id = gimp_id_table_insert (f->id_table, data1);
gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id); gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
@ -93,13 +93,13 @@ insert_twice (GimpTestFixture *f,
} }
/** /**
* insert_with_id: * gimp_test_id_insert_with_id:
* *
* Test that it is possible to insert data with a specific ID. * Test that it is possible to insert data with a specific ID.
**/ **/
static void static void
insert_with_id (GimpTestFixture *f, gimp_test_id_insert_with_id (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
const int id = 10; const int id = 10;
@ -111,14 +111,14 @@ insert_with_id (GimpTestFixture *f,
} }
/** /**
* insert_with_id_existing: * gimp_test_id_insert_with_id_existing:
* *
* Test that it is not possible to insert data with a specific ID if * Test that it is not possible to insert data with a specific ID if
* that ID already is inserted. * that ID already is inserted.
**/ **/
static void static void
insert_with_id_existing (GimpTestFixture *f, gimp_test_id_insert_with_id_existing (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
const int id = 10; const int id = 10;
@ -134,14 +134,14 @@ insert_with_id_existing (GimpTestFixture *f,
} }
/** /**
* replace: * gimp_test_id_replace:
* *
* Test that it is possible to replace data with a given ID with * Test that it is possible to replace data with a given ID with
* different data. * different data.
**/ **/
static void static void
replace (GimpTestFixture *f, gimp_test_id_replace (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
int ret_id = gimp_id_table_insert (f->id_table, data1); int ret_id = gimp_id_table_insert (f->id_table, data1);
gpointer ret_data; gpointer ret_data;
@ -153,14 +153,14 @@ replace (GimpTestFixture *f,
} }
/** /**
* replace_as_insert: * gimp_test_id_replace_as_insert:
* *
* Test that replace works like insert when there is no data to * Test that replace works like insert when there is no data to
* replace. * replace.
**/ **/
static void static void
replace_as_insert (GimpTestFixture *f, gimp_test_id_replace_as_insert (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
const int id = 10; const int id = 10;
@ -173,13 +173,13 @@ replace_as_insert (GimpTestFixture *f,
} }
/** /**
* remove: * gimp_test_id_remove:
* *
* Test that it is possible to remove data identified by the ID: * Test that it is possible to remove data identified by the ID:
**/ **/
static void static void
remove (GimpTestFixture *f, gimp_test_id_remove (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
gint ret_id = gimp_id_table_insert (f->id_table, data1); gint ret_id = gimp_id_table_insert (f->id_table, data1);
void *ret_data = gimp_id_table_lookup (f->id_table, ret_id); void *ret_data = gimp_id_table_lookup (f->id_table, ret_id);
@ -192,14 +192,14 @@ remove (GimpTestFixture *f,
} }
/** /**
* remove_non_existing: * gimp_test_id_remove_non_existing:
* *
* Tests that things work properly when trying to remove data with an * Tests that things work properly when trying to remove data with an
* ID that doesn't exist. * ID that doesn't exist.
**/ **/
static void static void
remove_non_existing (GimpTestFixture *f, gimp_test_id_remove_non_existing (GimpTestFixture *f,
gconstpointer data) gconstpointer data)
{ {
const int id = 10; const int id = 10;