Properly store changes for arrays. (#308528, Roger Leigh)

2005-06-22  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Properly store changes for arrays.  (#308528,
	Roger Leigh)
This commit is contained in:
Matthias Clasen 2005-06-22 17:09:31 +00:00 committed by Matthias Clasen
parent 0c2739405c
commit f8411a5b97
5 changed files with 14 additions and 6 deletions

View File

@ -3,7 +3,9 @@
* glib/goption.c (parse_short_option, parse_long_option):
Pass the option name also in the NO_ARG case. (#308602,
Masatake YAMATO)
(parse_arg): Properly store changes for arrays. (#308528,
Roger Leigh)
2005-06-22 Tor Lillqvist <tml@novell.com>
* glib/gfileutils.c (g_makepath): New function. Creates a

View File

@ -3,7 +3,9 @@
* glib/goption.c (parse_short_option, parse_long_option):
Pass the option name also in the NO_ARG case. (#308602,
Masatake YAMATO)
(parse_arg): Properly store changes for arrays. (#308528,
Roger Leigh)
2005-06-22 Tor Lillqvist <tml@novell.com>
* glib/gfileutils.c (g_makepath): New function. Creates a

View File

@ -3,7 +3,9 @@
* glib/goption.c (parse_short_option, parse_long_option):
Pass the option name also in the NO_ARG case. (#308602,
Masatake YAMATO)
(parse_arg): Properly store changes for arrays. (#308528,
Roger Leigh)
2005-06-22 Tor Lillqvist <tml@novell.com>
* glib/gfileutils.c (g_makepath): New function. Creates a

View File

@ -3,7 +3,9 @@
* glib/goption.c (parse_short_option, parse_long_option):
Pass the option name also in the NO_ARG case. (#308602,
Masatake YAMATO)
(parse_arg): Properly store changes for arrays. (#308528,
Roger Leigh)
2005-06-22 Tor Lillqvist <tml@novell.com>
* glib/gfileutils.c (g_makepath): New function. Creates a

View File

@ -758,7 +758,7 @@ parse_arg (GOptionContext *context,
if (change->allocated.array.len == 0)
{
change->prev.array = entry->arg_data;
change->prev.array = *(gchar ***)entry->arg_data;
change->allocated.array.data = g_new (gchar *, 2);
}
else
@ -816,7 +816,7 @@ parse_arg (GOptionContext *context,
if (change->allocated.array.len == 0)
{
change->prev.array = entry->arg_data;
change->prev.array = *(gchar ***)entry->arg_data;
change->allocated.array.data = g_new (gchar *, 2);
}
else