[glib/glib-2-28] gkeyfile: Only test file descriptors against -1



commit cfcd7f5f92b399f57aade097b46399cda898c422
Author: Hanro <hanro gmx de>
Date:   Thu Jun 2 15:44:19 2011 -0400

    gkeyfile: Only test file descriptors against -1
    
    Windows CE at least will return other (valid) negative values.

 glib/gkeyfile.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 31c2a15..0819ecf 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -318,13 +318,13 @@ find_file_in_data_dirs (const gchar   *file,
 
   data_dirs = dirs;
 
-  while (data_dirs && (data_dir = *data_dirs) && fd < 0)
+  while (data_dirs && (data_dir = *data_dirs) && fd == -1)
     {
       gchar *candidate_file, *sub_dir;
 
       candidate_file = (gchar *) file;
       sub_dir = g_strdup ("");
-      while (candidate_file != NULL && fd < 0)
+      while (candidate_file != NULL && fd == -1)
         {
           gchar *p;
 
@@ -333,7 +333,7 @@ find_file_in_data_dirs (const gchar   *file,
 
           fd = g_open (path, O_RDONLY, 0);
 
-          if (fd < 0)
+          if (fd == -1)
             {
               g_free (path);
               path = NULL;
@@ -359,7 +359,7 @@ find_file_in_data_dirs (const gchar   *file,
       data_dirs++;
     }
 
-  if (fd < 0)
+  if (fd == -1)
     {
       g_set_error_literal (error, G_KEY_FILE_ERROR,
                            G_KEY_FILE_ERROR_NOT_FOUND,
@@ -487,7 +487,7 @@ g_key_file_load_from_file (GKeyFile       *key_file,
 
   fd = g_open (file, O_RDONLY, 0);
 
-  if (fd < 0)
+  if (fd == -1)
     {
       g_set_error_literal (error, G_FILE_ERROR,
                            g_file_error_from_errno (errno),
@@ -612,7 +612,7 @@ g_key_file_load_from_dirs (GKeyFile       *key_file,
       fd = find_file_in_data_dirs (file, data_dirs, &output_path,
                                    &key_file_error);
 
-      if (fd < 0)
+      if (fd == -1)
         {
           if (key_file_error)
             g_propagate_error (error, key_file_error);



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