luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Call post-parse hooks also if argv is NULL. (#161668, Marcin Krzyzanowski)

Browse Source 
2004-12-19  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (g_option_context_parse): Call
	post-parse hooks also if argv is NULL.  (#161668,
	Marcin Krzyzanowski)
This commit is contained in:
Matthias Clasen 2004-12-19 05:20:12 +00:00 committed by Matthias Clasen
parent 251ae98a8b
commit e176f212a7
6 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-19 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Call
post-parse hooks also if argv is NULL. (#161668,
Marcin Krzyzanowski)
2004-12-16 Matthias Clasen <mclasen@redhat.com> 2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2004-12-19 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Call
post-parse hooks also if argv is NULL. (#161668,
Marcin Krzyzanowski)
2004-12-16 Matthias Clasen <mclasen@redhat.com> 2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2004-12-19 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Call
post-parse hooks also if argv is NULL. (#161668,
Marcin Krzyzanowski)
2004-12-16 Matthias Clasen <mclasen@redhat.com> 2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2004-12-19 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Call
post-parse hooks also if argv is NULL. (#161668,
Marcin Krzyzanowski)
2004-12-16 Matthias Clasen <mclasen@redhat.com> 2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2004-12-19 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Call
post-parse hooks also if argv is NULL. (#161668,
Marcin Krzyzanowski)
2004-12-16 Matthias Clasen <mclasen@redhat.com> 2004-12-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

43
glib/goption.c
View File

@ -1324,30 +1324,33 @@ g_option_context_parse (GOptionContext *context,
} }
} }
}
/* Call post-parse hooks */ /* Call post-parse hooks */
list = context->groups; list = context->groups;
while (list) while (list)
{
GOptionGroup *group = list->data;
if (group->post_parse_func)
{ {
GOptionGroup *group = list->data; if (!(* group->post_parse_func) (context, group,
group->user_data, error))
if (group->post_parse_func)
{
if (!(* group->post_parse_func) (context, group,
group->user_data, error))
goto fail;
}
list = list->next;
}
if (context->main_group && context->main_group->post_parse_func)
{
if (!(* context->main_group->post_parse_func) (context, context->main_group,
context->main_group->user_data, error))
goto fail; goto fail;
} }
list = list->next;
}
if (context->main_group && context->main_group->post_parse_func)
{
if (!(* context->main_group->post_parse_func) (context, context->main_group,
context->main_group->user_data, error))
goto fail;
}
if (argc && argv)
{
free_pending_nulls (context, TRUE); free_pending_nulls (context, TRUE);
for (i = 1; i < *argc; i++) for (i = 1; i < *argc; i++)