initialize option_name before using it.

Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>

        * glib/goption.c (parse_short_option): initialize option_name
        before using it.

diff --git a/ChangeLog b/ChangeLog
index 30ba5c9..a671ba5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/goption.c (parse_short_option): initialize option_name
+       before using it.
+
 2005-05-27  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_short_option, parse_long_option):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30ba5c9..a671ba5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/goption.c (parse_short_option): initialize option_name
+       before using it.
+
 2005-05-27  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_short_option, parse_long_option):

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 30ba5c9..a671ba5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/goption.c (parse_short_option): initialize option_name
+       before using it.
+
 2005-05-27  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_short_option, parse_long_option):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30ba5c9..a671ba5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/goption.c (parse_short_option): initialize option_name
+       before using it.
+
 2005-05-27  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_short_option, parse_long_option):

diff --git a/glib/goption.c b/glib/goption.c
index 4cfd459..60303c5 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -899,6 +899,8 @@ parse_short_option (GOptionContext *context,
 
                  return FALSE;
                }
+
+             option_name = g_strdup_printf ("-%c", group->entries[j].short_name);
              
              if (index < *argc - 1)
                {
@@ -914,8 +916,6 @@ parse_short_option (GOptionContext *context,
                  g_free (option_name);
                  return FALSE;
                }
-
-             option_name = g_strdup_printf ("-%c", group->entries[j].short_name);
              
              if (!parse_arg (context, group, &group->entries[j], value, option_name, error))
                {
@@ -970,7 +970,7 @@ parse_long_option (GOptionContext *context,
 
              add_pending_null (context, &((*argv)[*index]), NULL);
              option_name = g_strconcat ("--", group->entries[j].long_name, NULL);
-                     
+
              if (arg[len] == '=')
                value = arg + len + 1;
              else if (*index < *argc - 1)