diff options
| author | Philip Withnall <withnall@endlessm.com> | 2014-07-01 17:34:38 +0100 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2018-06-15 13:10:36 +0100 |
| commit | 09419fdeb49bae20a350fa838bacc180aba5eead (patch) | |
| tree | a500fa80a2aff3b4e28f9f73f8bad0139f65f735 | |
| parent | 3126f73c80dfc7d6c9a7d70e1b5772a1a8c98744 (diff) | |
| download | glib-09419fdeb49bae20a350fa838bacc180aba5eead.tar.gz | |
gvariant: Change type of ‘y’ variants from guchar to guint8
This fits better with the convention in the rest of GLib where arbitrary
8-bit values are represented as guint8, avoiding the potential confusing
of a name which references ‘char’s.
This is not an API break, as both guint8 and guchar are unconditionally
typedeffed to unsigned char.
https://gitlab.gnome.org/GNOME/glib/issues/896
| -rw-r--r-- | glib/gvariant.c | 10 | ||||
| -rw-r--r-- | glib/gvariant.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/glib/gvariant.c b/glib/gvariant.c index 8be9ce798..6a9b37c9a 100644 --- a/glib/gvariant.c +++ b/glib/gvariant.c @@ -403,11 +403,11 @@ g_variant_get_boolean (GVariant *value) * It is an error to call this function with a @value of any type * other than %G_VARIANT_TYPE_BYTE. * - * Returns: a #guchar + * Returns: a #guint8 * * Since: 2.24 **/ -NUMERIC_TYPE (BYTE, byte, guchar) +NUMERIC_TYPE (BYTE, byte, guint8) /** * g_variant_new_int16: @@ -1105,7 +1105,7 @@ g_variant_lookup_value (GVariant *dictionary, * the appropriate type: * - %G_VARIANT_TYPE_INT16 (etc.): #gint16 (etc.) * - %G_VARIANT_TYPE_BOOLEAN: #guchar (not #gboolean!) - * - %G_VARIANT_TYPE_BYTE: #guchar + * - %G_VARIANT_TYPE_BYTE: #guint8 * - %G_VARIANT_TYPE_HANDLE: #guint32 * - %G_VARIANT_TYPE_DOUBLE: #gdouble * @@ -5042,7 +5042,7 @@ g_variant_valist_get_leaf (const gchar **str, return; case 'y': - *(guchar *) ptr = g_variant_get_byte (value); + *(guint8 *) ptr = g_variant_get_byte (value); return; case 'n': @@ -5083,7 +5083,7 @@ g_variant_valist_get_leaf (const gchar **str, switch (*(*str)++) { case 'y': - *(guchar *) ptr = 0; + *(guint8 *) ptr = 0; return; case 'n': diff --git a/glib/gvariant.h b/glib/gvariant.h index 3e1392620..99e2470e9 100644 --- a/glib/gvariant.h +++ b/glib/gvariant.h @@ -80,7 +80,7 @@ GVariantClass g_variant_classify (GVarian GLIB_AVAILABLE_IN_ALL GVariant * g_variant_new_boolean (gboolean value); GLIB_AVAILABLE_IN_ALL -GVariant * g_variant_new_byte (guchar value); +GVariant * g_variant_new_byte (guint8 value); GLIB_AVAILABLE_IN_ALL GVariant * g_variant_new_int16 (gint16 value); GLIB_AVAILABLE_IN_ALL @@ -133,7 +133,7 @@ GVariant * g_variant_new_fixed_array (const G GLIB_AVAILABLE_IN_ALL gboolean g_variant_get_boolean (GVariant *value); GLIB_AVAILABLE_IN_ALL -guchar g_variant_get_byte (GVariant *value); +guint8 g_variant_get_byte (GVariant *value); GLIB_AVAILABLE_IN_ALL gint16 g_variant_get_int16 (GVariant *value); GLIB_AVAILABLE_IN_ALL |