diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2011-12-22 00:16:06 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2012-01-11 20:48:29 +0000 |
| commit | e98f17e5cf1696d418444b23cb092be0eaba3008 (patch) | |
| tree | bd3977ec1d103cca1cdde3dc86208962a575f347 | |
| parent | f8843a0feb09898fea320a5a65a443bc5a70d78e (diff) | |
| download | glib-e98f17e5cf1696d418444b23cb092be0eaba3008.tar.gz | |
Bug 666700 — Add some missing (allow-none) annotations
Add some missing (allow-none) annotations to GContentType, GIcon and
GHashTable methods.
Closes: bgo#666700
| -rw-r--r-- | gio/gcontenttype.c | 2 | ||||
| -rw-r--r-- | gio/gicon.c | 4 | ||||
| -rw-r--r-- | glib/ghash.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index b817f832a..a9bdb4b57 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -1649,7 +1649,7 @@ match_match (TreeMatch *match, * g_mount_guess_content_type(). * * Returns: (transfer full) (array zero-terminated=1): an %NULL-terminated - * array of zero or more content types, or %NULL. Free with g_strfreev() + * array of zero or more content types. Free with g_strfreev() * * Since: 2.18 */ diff --git a/gio/gicon.c b/gio/gicon.c index 494c2cea3..abc9a8d2f 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -94,8 +94,8 @@ g_icon_hash (gconstpointer icon) /** * g_icon_equal: - * @icon1: pointer to the first #GIcon. - * @icon2: pointer to the second #GIcon. + * @icon1: (allow-none): pointer to the first #GIcon. + * @icon2: (allow-none): pointer to the second #GIcon. * * Checks if two icons are equal. * diff --git a/glib/ghash.c b/glib/ghash.c index 93655fd30..6569435aa 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -1047,7 +1047,7 @@ g_hash_table_destroy (GHashTable *hash_table) * and has the value %NULL. If you need this distinction, use * g_hash_table_lookup_extended(). * - * Return value: the associated value, or %NULL if the key is not found + * Return value: (allow-none): the associated value, or %NULL if the key is not found */ gpointer g_hash_table_lookup (GHashTable *hash_table, @@ -1069,8 +1069,8 @@ g_hash_table_lookup (GHashTable *hash_table, * g_hash_table_lookup_extended: * @hash_table: a #GHashTable * @lookup_key: the key to look up - * @orig_key: return location for the original key, or %NULL - * @value: return location for the value associated with the key, or %NULL + * @orig_key: (allow-none): return location for the original key, or %NULL + * @value: (allow-none): return location for the value associated with the key, or %NULL * * Looks up a key in the #GHashTable, returning the original key and the * associated value and a #gboolean which is %TRUE if the key was found. This @@ -1532,7 +1532,7 @@ g_hash_table_foreach (GHashTable *hash_table, * (keep in mind that an O(n) find/foreach operation issued for all n * values in a hash table ends up needing O(n*n) operations). * - * Return value: The value of the first key/value pair is returned, + * Return value: (allow-none): The value of the first key/value pair is returned, * for which @predicate evaluates to %TRUE. If no pair with the * requested property is found, %NULL is returned. * |