[glib: 2/9] Fix several signedness warnings in gio/gsettings-mapping.c




commit 8b1959dafe00e8bd2b9875ecf4fe9068f2119af6
Author: Emmanuel Fleury <emmanuel fleury gmail com>
Date:   Tue Nov 17 22:07:53 2020 +0100

    Fix several signedness warnings in gio/gsettings-mapping.c
    
    gio/gsettings-mapping.c: In function ‘g_settings_set_mapping_int’:
    gio/gsettings-mapping.c:65:23: error: comparison of integer expressions of different signedness: ‘gint64’ 
{aka ‘long int’} and ‘long unsigned int’
       65 |       if (0 <= l && l <= G_MAXUINT64)
          |                       ^~
    gio/gsettings-mapping.c: In function ‘g_settings_set_mapping_float’:
    gio/gsettings-mapping.c:120:23: error: comparison of integer expressions of different signedness: 
‘gint64’ {aka ‘long int’} and ‘long unsigned int’
      120 |       if (0 <= l && l <= G_MAXUINT64)
          |                       ^~
    gio/gsettings-mapping.c: In function ‘g_settings_get_mapping_int’:
    gio/gsettings-mapping.c:224:27: error: comparison of integer expressions of different signedness: 
‘gint64’ {aka ‘long int’} and ‘long unsigned int’
      224 |       return (0 <= l && l <= G_MAXUINT64);
          |                           ^~
    gio/gsettings-mapping.c: In function ‘g_settings_get_mapping_float’:
    gio/gsettings-mapping.c:269:27: error: comparison of integer expressions of different signedness: 
‘gint64’ {aka ‘long int’} and ‘long unsigned int’
      269 |       return (0 <= l && l <= G_MAXUINT64);
          |                           ^~

 gio/gsettings-mapping.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/gsettings-mapping.c b/gio/gsettings-mapping.c
index 8c64b02a5..4db9724fe 100644
--- a/gio/gsettings-mapping.c
+++ b/gio/gsettings-mapping.c
@@ -62,7 +62,7 @@ g_settings_set_mapping_int (const GValue       *value,
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT64))
     {
-      if (0 <= l && l <= G_MAXUINT64)
+      if (0 <= l && (guint64) l <= G_MAXUINT64)
         variant = g_variant_new_uint64 ((guint64) l);
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_HANDLE))
@@ -117,7 +117,7 @@ g_settings_set_mapping_float (const GValue       *value,
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT64))
     {
-      if (0 <= l && l <= G_MAXUINT64)
+      if (0 <= l && (guint64) l <= G_MAXUINT64)
         variant = g_variant_new_uint64 ((guint64) l);
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_HANDLE))
@@ -221,7 +221,7 @@ g_settings_get_mapping_int (GValue   *value,
   else if (G_VALUE_HOLDS_UINT64 (value))
     {
       g_value_set_uint64 (value, l);
-      return (0 <= l && l <= G_MAXUINT64);
+      return (0 <= l && (guint64) l <= G_MAXUINT64);
     }
   else if (G_VALUE_HOLDS_DOUBLE (value))
     {
@@ -266,7 +266,7 @@ g_settings_get_mapping_float (GValue   *value,
   else if (G_VALUE_HOLDS_UINT64 (value))
     {
       g_value_set_uint64 (value, l);
-      return (0 <= l && l <= G_MAXUINT64);
+      return (0 <= l && (guint64) l <= G_MAXUINT64);
     }
   else if (G_VALUE_HOLDS_DOUBLE (value))
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]