From 6b931891bc526616f124f97a2b4c815ab8f4032c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 28 Oct 2004 18:42:46 +0000 Subject: [PATCH] Don't use S_ISREG macro (#156728, Kazuki IWAMOTO) 2004-10-28 Ray Strode * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, Kazuki IWAMOTO) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gkeyfile.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d8fe77..981f86f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-28 Ray Strode + + * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, + Kazuki IWAMOTO) + 2004-10-28 Matthias Clasen * glib/gstdio.c: Include galias.h before glib.h (#156697, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d8fe77..981f86f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-10-28 Ray Strode + + * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, + Kazuki IWAMOTO) + 2004-10-28 Matthias Clasen * glib/gstdio.c: Include galias.h before glib.h (#156697, diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3d8fe77..981f86f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-10-28 Ray Strode + + * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, + Kazuki IWAMOTO) + 2004-10-28 Matthias Clasen * glib/gstdio.c: Include galias.h before glib.h (#156697, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3d8fe77..981f86f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-10-28 Ray Strode + + * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, + Kazuki IWAMOTO) + 2004-10-28 Matthias Clasen * glib/gstdio.c: Include galias.h before glib.h (#156697, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3d8fe77..981f86f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-10-28 Ray Strode + + * glib/gkeyfile.c: Don't use S_ISREG macro (#156728, + Kazuki IWAMOTO) + 2004-10-28 Matthias Clasen * glib/gstdio.c: Include galias.h before glib.h (#156697, diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index cb34ea3..9f18511 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -365,7 +365,7 @@ g_key_file_load_from_fd (GKeyFile *key_file, gchar read_buf[4096]; fstat (fd, &stat_buf); - if (!S_ISREG (stat_buf.st_mode)) + if ((stat_buf.st_mode & S_IFMT) == S_IFREG) { g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE, -- 2.7.4