callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: void * -> gpointer in GimpIdTable

Browse Source
This commit is contained in:
Martin Nordholts
2011-05-04 23:14:21 +02:00
parent 0d529f7956
commit c4097d4ff4
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/core/gimpidtable.c
View File

@ -124,7 +124,7 @@ gimp_id_table_new (void)
* Returns: The assigned ID. * Returns: The assigned ID.
**/ **/
gint gint
gimp_id_table_insert (GimpIdTable *id_table, void *data) gimp_id_table_insert (GimpIdTable *id_table, gpointer data)
{ {
gint new_id; gint new_id;
@ -154,7 +154,7 @@ gimp_id_table_insert (GimpIdTable *id_table, void *data)
* Returns: The used ID if successful, -1 if it was already in use. * Returns: The used ID if successful, -1 if it was already in use.
**/ **/
gint gint
gimp_id_table_insert_with_id (GimpIdTable *id_table, gint id, void *data) gimp_id_table_insert_with_id (GimpIdTable *id_table, gint id, gpointer data)
{ {
g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), 0); g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), 0);
g_return_val_if_fail (id > 0, 0); g_return_val_if_fail (id > 0, 0);
@ -177,7 +177,7 @@ gimp_id_table_insert_with_id (GimpIdTable *id_table, gint id, void *data)
* entry in the id table. * entry in the id table.
**/ **/
void void
gimp_id_table_replace (GimpIdTable *id_table, gint id, void *data) gimp_id_table_replace (GimpIdTable *id_table, gint id, gpointer data)
{ {
g_return_if_fail (GIMP_IS_ID_TABLE (id_table)); g_return_if_fail (GIMP_IS_ID_TABLE (id_table));
g_return_if_fail (id > 0); g_return_if_fail (id > 0);
@ -194,7 +194,7 @@ gimp_id_table_replace (GimpIdTable *id_table, gint id, void *data)
* *
* Returns: The data, or NULL if no data with the given ID was found. * Returns: The data, or NULL if no data with the given ID was found.
**/ **/
void * gpointer
gimp_id_table_lookup (GimpIdTable *id_table, gint id) gimp_id_table_lookup (GimpIdTable *id_table, gint id)
{ {
g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), NULL); g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), NULL);

8
app/core/gimpidtable.h
View File

@ -52,14 +52,14 @@ struct _GimpIdTableClass
GType gimp_id_table_get_type (void) G_GNUC_CONST; GType gimp_id_table_get_type (void) G_GNUC_CONST;
GimpIdTable * gimp_id_table_new (void); GimpIdTable * gimp_id_table_new (void);
gint gimp_id_table_insert (GimpIdTable *id_table, gint gimp_id_table_insert (GimpIdTable *id_table,
void *data); gpointer data);
gint gimp_id_table_insert_with_id (GimpIdTable *id_table, gint gimp_id_table_insert_with_id (GimpIdTable *id_table,
gint id, gint id,
void *data); gpointer data);
void gimp_id_table_replace (GimpIdTable *id_table, void gimp_id_table_replace (GimpIdTable *id_table,
gint id, gint id,
void *data); gpointer data);
void * gimp_id_table_lookup (GimpIdTable *id_table, gpointer gimp_id_table_lookup (GimpIdTable *id_table,
gint id); gint id);
gboolean gimp_id_table_remove (GimpIdTable *id_table, gboolean gimp_id_table_remove (GimpIdTable *id_table,
gint id); gint id);

20
app/tests/test-gimpidtable.c
View File

@ -43,8 +43,8 @@ typedef struct
} GimpTestFixture; } GimpTestFixture;
static void *data1 = (void *) 0x00000001; static gpointer data1 = (gpointer) 0x00000001;
static void *data2 = (void *) 0x00000002; static gpointer data2 = (gpointer) 0x00000002;
static void static void
@ -72,7 +72,7 @@ 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);
void *ret_data = gimp_id_table_lookup (f->id_table, ret_id); gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
g_assert (ret_data == data1); g_assert (ret_data == data1);
} }
@ -87,9 +87,9 @@ 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);
void *ret_data = gimp_id_table_lookup (f->id_table, ret_id); gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
gint ret_id2 = gimp_id_table_insert (f->id_table, data2); gint ret_id2 = gimp_id_table_insert (f->id_table, data2);
void *ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2); gpointer ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2);
g_assert (ret_id != ret_id2); g_assert (ret_id != ret_id2);
g_assert (ret_data == data1); g_assert (ret_data == data1);
@ -108,7 +108,7 @@ insert_with_id (GimpTestFixture *f,
const int id = 10; const int id = 10;
int ret_id = gimp_id_table_insert_with_id (f->id_table, id, data1); int ret_id = gimp_id_table_insert_with_id (f->id_table, id, data1);
void *ret_data = gimp_id_table_lookup (f->id_table, id); gpointer ret_data = gimp_id_table_lookup (f->id_table, id);
g_assert (ret_id == id); g_assert (ret_id == id);
g_assert (ret_data == data1); g_assert (ret_data == data1);
@ -127,9 +127,9 @@ insert_with_id_existing (GimpTestFixture *f,
const int id = 10; const int id = 10;
int ret_id = gimp_id_table_insert_with_id (f->id_table, id, data1); int ret_id = gimp_id_table_insert_with_id (f->id_table, id, data1);
void *ret_data = gimp_id_table_lookup (f->id_table, ret_id); gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
int ret_id2 = gimp_id_table_insert_with_id (f->id_table, id, data2); int ret_id2 = gimp_id_table_insert_with_id (f->id_table, id, data2);
void *ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2); gpointer ret_data2 = gimp_id_table_lookup (f->id_table, ret_id2);
g_assert (id == ret_id); g_assert (id == ret_id);
g_assert (ret_id2 == -1); g_assert (ret_id2 == -1);
@ -148,7 +148,7 @@ 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);
void *ret_data; gpointer ret_data;
gimp_id_table_replace (f->id_table, ret_id, data2); gimp_id_table_replace (f->id_table, ret_id, data2);
ret_data = gimp_id_table_lookup (f->id_table, ret_id); ret_data = gimp_id_table_lookup (f->id_table, ret_id);
@ -168,7 +168,7 @@ replace_as_insert (GimpTestFixture *f,
{ {
const int id = 10; const int id = 10;
void *ret_data; gpointer ret_data;
gimp_id_table_replace (f->id_table, id, data1); gimp_id_table_replace (f->id_table, id, data1);
ret_data = gimp_id_table_lookup (f->id_table, id); ret_data = gimp_id_table_lookup (f->id_table, id);