Move initialization of variables after g_return_val_if_fail. (#131564,

Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/gstring.c (g_string_up):
	* glib/gstring.c (g_string_down):
	* glib/gstring.c (g_string_ascii_up):
	* glib/gstring.c (g_string_ascii_down): Move initialization of
	variables after g_return_val_if_fail.  (#131564, Olivier Poncet)

diff --git a/ChangeLog b/ChangeLog
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11f3456e705ce60d1de31cf857da7e317a3a076b..9ed49a51441579a9d56c219f4620acdf9422544d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Jan 15 22:35:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gstring.c (g_string_up): 
+       * glib/gstring.c (g_string_down): 
+       * glib/gstring.c (g_string_ascii_up): 
+       * glib/gstring.c (g_string_ascii_down): Move initialization of
+       variables after g_return_val_if_fail.  (#131564, Olivier Poncet)
+
 Sun Jan 11 16:13:20 2004  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Add G_MAXSIZE, define in terms of G_MAXUfoo.

diff --git a/glib/gstring.c b/glib/gstring.c
index 4f212a6dec7f35b75048765354a84ecd4c3de789..585406ec4705d60e93c0bf5644ca883fd78e570f 100644 (file)
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -702,10 +702,11 @@ GString*
 g_string_ascii_down (GString *string)
 {
   gchar *s;
-  gint n = string->len;
+  gint n;
 
   g_return_val_if_fail (string != NULL, NULL);
 
+  n = string->len;
   s = string->str;
 
   while (n)
@@ -764,10 +765,11 @@ GString*
 g_string_down (GString *string)
 {
   guchar *s;
-  glong n = string->len;    
+  glong n;
 
   g_return_val_if_fail (string != NULL, NULL);
 
+  n = string->len;    
   s = (guchar *) string->str;
 
   while (n)
@@ -797,10 +799,11 @@ GString*
 g_string_up (GString *string)
 {
   guchar *s;
-  glong n = string->len;
+  glong n;
 
   g_return_val_if_fail (string != NULL, NULL);
 
+  n = string->len;
   s = (guchar *) string->str;
 
   while (n)