Don't create the option_name twice. (#334519, Chris Wilson)

2006-03-14  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_short_option): Don't create the
	option_name twice.  (#334519, Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index debb4d67fc2e95cc280c9fc750716690705df726..c97d3d51f80046e6989e3cfcbabb71906a8a4c47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (parse_short_option): Don't create the
+       option_name twice.  (#334519, Chris Wilson)
+
 2006-03-13  Anders Carlsson  <andersca@luminoth.local>
 
        * configure.in: Revert fix for #322476, it breaks module loading

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index debb4d67fc2e95cc280c9fc750716690705df726..c97d3d51f80046e6989e3cfcbabb71906a8a4c47 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (parse_short_option): Don't create the
+       option_name twice.  (#334519, Chris Wilson)
+
 2006-03-13  Anders Carlsson  <andersca@luminoth.local>
 
        * configure.in: Revert fix for #322476, it breaks module loading

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index debb4d67fc2e95cc280c9fc750716690705df726..c97d3d51f80046e6989e3cfcbabb71906a8a4c47 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-03-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (parse_short_option): Don't create the
+       option_name twice.  (#334519, Chris Wilson)
+
 2006-03-13  Anders Carlsson  <andersca@luminoth.local>
 
        * configure.in: Revert fix for #322476, it breaks module loading

diff --git a/glib/goption.c b/glib/goption.c
index 820b6174d3ef72996e3d60a9a7db3863bcc3b2e5..40ce662d8b63efa3e657618979635210087b24cc 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -928,8 +928,6 @@ parse_short_option (GOptionContext *context,
                  return FALSE;
                }
 
-             option_name = g_strdup_printf ("-%c", group->entries[j].short_name);
-             
              if (index < *argc - 1)
                {
                  if (!OPTIONAL_ARG (&group->entries[j]))