Put the g_return_val_if_fail() in the right place.

Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>

        * glib/giochannel.c (g_io_error_get_from_g_error): Put
        the g_return_val_if_fail() in the right place.

diff --git a/ChangeLog b/ChangeLog
index c218584..ab2226d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c218584..ab2226d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c218584..ab2226d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c218584..ab2226d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c218584..ab2226d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c218584..ab2226d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Jun  1 09:42:36 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_error_get_from_g_error): Put 
+       the g_return_val_if_fail() in the right place.
+
 Fri May 31 1:17:45 2003  Ray Strode  <halfline@hawaii.rr.com>
 
        * glib/giochannel.c (g_io_channel_error_from_errno):

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 6ceeb4e..6b02cc8 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -131,8 +131,6 @@ static GIOError
 g_io_error_get_from_g_error (GIOStatus status,
                             GError *err)
 {
-  g_return_val_if_fail (err != NULL, G_IO_ERROR_UNKNOWN);
-       
   switch (status)
     {
       case G_IO_STATUS_NORMAL:
@@ -141,6 +139,8 @@ g_io_error_get_from_g_error (GIOStatus status,
       case G_IO_STATUS_AGAIN:
         return G_IO_ERROR_AGAIN;
       case G_IO_STATUS_ERROR:
+       g_return_val_if_fail (err != NULL, G_IO_ERROR_UNKNOWN);
+       
         if (err->domain != G_IO_CHANNEL_ERROR)
           return G_IO_ERROR_UNKNOWN;
         switch (err->code)