From 6e6bbbd4d5441b6c6393c42d575bf3a308c2ba5d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 1 Jun 2003 13:44:47 +0000 Subject: [PATCH] Put the g_return_val_if_fail() in the right place. Sun Jun 1 09:42:36 2003 Owen Taylor * glib/giochannel.c (g_io_error_get_from_g_error): Put the g_return_val_if_fail() in the right place. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/giochannel.c | 4 ++-- 7 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c218584..ab2226d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jun 1 09:42:36 2003 Owen Taylor + + * 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 * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/glib/giochannel.c b/glib/giochannel.c index 6ceeb4e..6b02cc8 100644 --- 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) -- 2.7.4