Use g_return_val_if_fail instead of g_return_if_fail, as the function now

2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gstring.c (g_string_free): Use g_return_val_if_fail instead of
	g_return_if_fail, as the function now is supposed to return
	something.

diff --git a/ChangeLog b/ChangeLog
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e24e2e5..1c63c85 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2000-09-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * gstring.c (g_string_free): Use g_return_val_if_fail instead of
+       g_return_if_fail, as the function now is supposed to return
+       something.
+       
        * gerror.c, gerror.h (g_propagte_error): Added function
        g_propagte_error to hand over local errors to the calling
        function.

diff --git a/glib/gstring.c b/glib/gstring.c
index ee38050..70a7666 100644 (file)
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -257,7 +257,7 @@ g_string_free (GString *string,
 {
   gchar *segment;
 
-  g_return_if_fail (string != NULL);
+  g_return_val_if_fail (string != NULL, NULL);
 
   if (free_segment)
     {

diff --git a/gstring.c b/gstring.c
index ee38050..70a7666 100644 (file)
--- a/gstring.c
+++ b/gstring.c
@@ -257,7 +257,7 @@ g_string_free (GString *string,
 {
   gchar *segment;
 
-  g_return_if_fail (string != NULL);
+  g_return_val_if_fail (string != NULL, NULL);
 
   if (free_segment)
     {