luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle int64 and double types correctly

Browse Source
This commit is contained in:
Matthias Clasen 2010-04-19 10:34:42 -04:00
parent a072c1fc29
commit 3f354af402
1 changed files with 122 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
gio/gsettings-mapping.c
View File

@ -24,18 +24,16 @@
#include "gsettings-mapping.h" #include "gsettings-mapping.h"
static GVariant * static GVariant *
g_settings_set_mapping_numeric (const GValue *value, g_settings_set_mapping_int (const GValue *value,
const GVariantType *expected_type) const GVariantType *expected_type)
{ {
GVariant *variant = NULL; GVariant *variant = NULL;
glong l; gint64 l;
if (G_VALUE_HOLDS_INT (value)) if (G_VALUE_HOLDS_INT (value))
l = g_value_get_int (value); l = g_value_get_int (value);
else if (G_VALUE_HOLDS_INT64 (value)) else if (G_VALUE_HOLDS_INT64 (value))
l = g_value_get_int64 (value); l = g_value_get_int64 (value);
else if (G_VALUE_HOLDS_DOUBLE (value))
l = g_value_get_double (value);
else else
return NULL; return NULL;
@ -75,14 +73,68 @@ g_settings_set_mapping_numeric (const GValue *value,
variant = g_variant_new_handle ((guint) l); variant = g_variant_new_handle ((guint) l);
} }
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE)) else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE))
variant = g_variant_new_double ((double) l); variant = g_variant_new_double ((gdouble) l);
return variant; return variant;
} }
static GVariant * static GVariant *
g_settings_set_mapping_unsigned_numeric (const GValue *value, g_settings_set_mapping_float (const GValue *value,
const GVariantType *expected_type) const GVariantType *expected_type)
{
GVariant *variant = NULL;
gdouble d;
gint64 l;
if (G_VALUE_HOLDS_DOUBLE (value))
d = g_value_get_double (value);
else
return NULL;
l = (gint64) d;
if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT16))
{
if (G_MININT16 <= l && l <= G_MAXINT16)
variant = g_variant_new_int16 ((gint16) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT16))
{
if (0 <= l && l <= G_MAXUINT16)
variant = g_variant_new_uint16 ((guint16) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT32))
{
if (G_MININT32 <= l && l <= G_MAXINT32)
variant = g_variant_new_int32 ((gint) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT32))
{
if (0 <= l && l <= G_MAXUINT32)
variant = g_variant_new_uint32 ((guint) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT64))
{
if (G_MININT64 <= l && l <= G_MAXINT64)
variant = g_variant_new_int64 ((gint64) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT64))
{
if (0 <= l && l <= G_MAXUINT64)
variant = g_variant_new_uint64 ((guint64) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_HANDLE))
{
if (0 <= l && l <= G_MAXUINT32)
variant = g_variant_new_handle ((guint) l);
}
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE))
variant = g_variant_new_double ((gdouble) d);
return variant;
}
static GVariant *
g_settings_set_mapping_unsigned_int (const GValue *value,
const GVariantType *expected_type)
{ {
GVariant *variant = NULL; GVariant *variant = NULL;
gulong u; gulong u;
@ -130,17 +182,17 @@ g_settings_set_mapping_unsigned_numeric (const GValue *value,
variant = g_variant_new_handle ((guint) u); variant = g_variant_new_handle ((guint) u);
} }
else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE)) else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_DOUBLE))
variant = g_variant_new_double ((double) u); variant = g_variant_new_double ((gdouble) u);
return variant; return variant;
} }
static gboolean static gboolean
g_settings_get_mapping_numeric (GValue *value, g_settings_get_mapping_int (GValue *value,
GVariant *variant) GVariant *variant)
{ {
const GVariantType *type; const GVariantType *type;
glong l; gint64 l;
type = g_variant_get_type (variant); type = g_variant_get_type (variant);
@ -150,8 +202,6 @@ g_settings_get_mapping_numeric (GValue *value,
l = g_variant_get_int32 (variant); l = g_variant_get_int32 (variant);
else if (g_variant_type_equal (type, G_VARIANT_TYPE_INT64)) else if (g_variant_type_equal (type, G_VARIANT_TYPE_INT64))
l = g_variant_get_int64 (variant); l = g_variant_get_int64 (variant);
else if (g_variant_type_equal (type, G_VARIANT_TYPE_DOUBLE))
l = g_variant_get_double (variant);
else else
return FALSE; return FALSE;
@ -185,8 +235,52 @@ g_settings_get_mapping_numeric (GValue *value,
} }
static gboolean static gboolean
g_settings_get_mapping_unsigned_numeric (GValue *value, g_settings_get_mapping_float (GValue *value,
GVariant *variant) GVariant *variant)
{
const GVariantType *type;
gdouble d;
gint64 l;
type = g_variant_get_type (variant);
if (g_variant_type_equal (type, G_VARIANT_TYPE_DOUBLE))
d = g_variant_get_double (variant);
else
return FALSE;
l = (gint64)d;
if (G_VALUE_HOLDS_INT (value))
{
g_value_set_int (value, l);
return (G_MININT32 <= l && l <= G_MAXINT32);
}
else if (G_VALUE_HOLDS_UINT (value))
{
g_value_set_uint (value, l);
return (0 <= l && l <= G_MAXUINT32);
}
else if (G_VALUE_HOLDS_INT64 (value))
{
g_value_set_int64 (value, l);
return (G_MININT64 <= l && l <= G_MAXINT64);
}
else if (G_VALUE_HOLDS_UINT64 (value))
{
g_value_set_uint64 (value, l);
return (0 <= l && l <= G_MAXUINT64);
}
else if (G_VALUE_HOLDS_DOUBLE (value))
{
g_value_set_double (value, d);
return TRUE;
}
return FALSE;
}
static gboolean
g_settings_get_mapping_unsigned_int (GValue *value,
GVariant *variant)
{ {
const GVariantType *type; const GVariantType *type;
gulong u; gulong u;
@ -259,13 +353,15 @@ g_settings_set_mapping (const GValue *value,
} }
else if (G_VALUE_HOLDS_INT (value) || else if (G_VALUE_HOLDS_INT (value) ||
G_VALUE_HOLDS_INT64 (value) || G_VALUE_HOLDS_INT64 (value))
G_VALUE_HOLDS_DOUBLE (value)) return g_settings_set_mapping_int (value, expected_type);
return g_settings_set_mapping_numeric (value, expected_type);
else if (G_VALUE_HOLDS_DOUBLE (value))
return g_settings_set_mapping_float (value, expected_type);
else if (G_VALUE_HOLDS_UINT (value) || else if (G_VALUE_HOLDS_UINT (value) ||
G_VALUE_HOLDS_UINT64 (value)) G_VALUE_HOLDS_UINT64 (value))
return g_settings_set_mapping_unsigned_numeric (value, expected_type); return g_settings_set_mapping_unsigned_int (value, expected_type);
else if (G_VALUE_HOLDS_STRING (value)) else if (G_VALUE_HOLDS_STRING (value))
{ {
@ -310,15 +406,17 @@ g_settings_get_mapping (GValue *value,
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_INT16) || else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_INT16) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_INT32) || g_variant_is_of_type (variant, G_VARIANT_TYPE_INT32) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_INT64) || g_variant_is_of_type (variant, G_VARIANT_TYPE_INT64))
g_variant_is_of_type (variant, G_VARIANT_TYPE_DOUBLE)) return g_settings_get_mapping_int (value, variant);
return g_settings_get_mapping_numeric (value, variant);
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_DOUBLE))
return g_settings_get_mapping_float (value, variant);
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT16) || else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT16) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32) || g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT64) || g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT64) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_HANDLE)) g_variant_is_of_type (variant, G_VARIANT_TYPE_HANDLE))
return g_settings_get_mapping_unsigned_numeric (value, variant); return g_settings_get_mapping_unsigned_int (value, variant);
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING) || else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING) ||
g_variant_is_of_type (variant, G_VARIANT_TYPE_OBJECT_PATH) || g_variant_is_of_type (variant, G_VARIANT_TYPE_OBJECT_PATH) ||