Avoid var declaration after statement.

2003-07-09  Morten Welinder  <terra@gnome.org>

	* glib/gprintf.c (g_vasprintf): Avoid var declaration after
	statement.

diff --git a/ChangeLog b/ChangeLog
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 32a940ad18f5484334014c64b29eb8c3576f82e9..b031509b92497b2e4349024304d46590817bb9b9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-07-09  Morten Welinder  <terra@gnome.org>
+
+       * glib/gprintf.c (g_vasprintf): Avoid var declaration after
+       statement.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
        Support for one-time initialization functions.  (#69668, Sebastian Wilhelmi)

diff --git a/glib/gprintf.c b/glib/gprintf.c
index 03d8a076a5949bf3e1cbf46e6f9fe3881ac08d22..209abf6cd99e8fd5f406da1e040896e1836129e9 100644 (file)
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -302,14 +302,16 @@ g_vasprintf (gchar      **string,
       *string = string1;
     }
 #else
-  va_list args2;
+  {
+    va_list args2;
 
-  G_VA_COPY (args2, args);
+    G_VA_COPY (args2, args);
 
-  *string = g_new (gchar, g_printf_string_upper_bound (format, args));
+    *string = g_new (gchar, g_printf_string_upper_bound (format, args));
 
-  len = _g_vsprintf (*string, format, args2);
-  va_end (args2);
+    len = _g_vsprintf (*string, format, args2);
+    va_end (args2);
+  }
 #endif
 
   return len;