From 99024c7ea7be03b02b8084a739153b93e21a6f44 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 14 Mar 2006 15:34:54 +0000 Subject: [PATCH] Don't create the option_name twice. (#334519, Chris Wilson) 2006-03-14 Matthias Clasen * glib/goption.c (parse_short_option): Don't create the option_name twice. (#334519, Chris Wilson) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ glib/goption.c | 2 -- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index debb4d67..c97d3d51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-14 Matthias Clasen + + * glib/goption.c (parse_short_option): Don't create the + option_name twice. (#334519, Chris Wilson) + 2006-03-13 Anders Carlsson * configure.in: Revert fix for #322476, it breaks module loading diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index debb4d67..c97d3d51 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-03-14 Matthias Clasen + + * glib/goption.c (parse_short_option): Don't create the + option_name twice. (#334519, Chris Wilson) + 2006-03-13 Anders Carlsson * configure.in: Revert fix for #322476, it breaks module loading diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index debb4d67..c97d3d51 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2006-03-14 Matthias Clasen + + * glib/goption.c (parse_short_option): Don't create the + option_name twice. (#334519, Chris Wilson) + 2006-03-13 Anders Carlsson * configure.in: Revert fix for #322476, it breaks module loading diff --git a/glib/goption.c b/glib/goption.c index 820b6174..40ce662d 100644 --- 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])) -- 2.34.1