luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

grel: Factor out internal helper to improve type safety

Browse Source 
We would otherwise have to have cast and lost width and signedness on
both the arguments to, and return value from, `g_relation_count()`.
Simpler to add an internal helper with the right types, and only do the
casts on the public API wrapper where API stability means it’s
unavoidable.

Fixes some more `-Wsign-conversion` warnings.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3405
This commit is contained in:
Philip Withnall
2025-04-10 18:56:25 +01:00
parent ef065dd195
commit c5afe67022
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
glib/deprecated/grel.c
View File

@@ -106,6 +106,10 @@ struct _GRelation
size_t count;
};
static size_t relation_count_internal (GRelation *relation,
gconstpointer key,
size_t field);
/**
* GTuples:
* @len: the number of records that matched.
@@ -477,7 +481,7 @@ g_relation_select (GRelation *relation,
if (!key_table)
return (GTuples*)tuples;
count = g_relation_count (relation, key, field);
count = relation_count_internal (relation, key, unsigned_field);
tuples->data = g_malloc (sizeof (gpointer) * relation->fields * count);
tuples->width = relation->fields;
@@ -489,6 +493,29 @@ g_relation_select (GRelation *relation,
return (GTuples*)tuples;
}
static size_t
relation_count_internal (GRelation *relation,
gconstpointer key,
size_t field)
{
GHashTable *table;
GHashTable *key_table;
g_return_val_if_fail (relation != NULL, 0);
g_return_val_if_fail (field < relation->fields, 0);
table = relation->hashed_tuple_tables[field];
g_return_val_if_fail (table != NULL, 0);
key_table = g_hash_table_lookup (table, key);
if (!key_table)
return 0;
return g_hash_table_size (key_table);
}
/**
* g_relation_count:
* @relation: a #GRelation.
@@ -507,24 +534,14 @@ g_relation_count (GRelation *relation,
gconstpointer key,
gint field)
{
GHashTable *table;
GHashTable *key_table;
size_t unsigned_field;
g_return_val_if_fail (relation != NULL, 0);
unsigned int n_matches;
g_return_val_if_fail (field >= 0 && (size_t) field < relation->fields, 0);
unsigned_field = (size_t) field;
table = relation->hashed_tuple_tables[unsigned_field];
g_return_val_if_fail (table != NULL, 0);
key_table = g_hash_table_lookup (table, key);
if (!key_table)
return 0;
return g_hash_table_size (key_table);
/* Do the best we can with the limited return type */
n_matches = relation_count_internal (relation, key, (size_t) field);
g_return_val_if_fail (n_matches <= G_MAXINT, G_MAXINT);
return (gint) n_matches;
}
/**