mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-14 00:06:24 +01:00
goption.c: Simplfy parse_short_option()
This commit is contained in:
parent
3653260ec2
commit
b21766ec3c
@ -1543,23 +1543,14 @@ parse_short_option (GOptionContext *context,
|
||||
|
||||
if (idx < *argc - 1)
|
||||
{
|
||||
if (!OPTIONAL_ARG (&group->entries[j]))
|
||||
if (OPTIONAL_ARG (&group->entries[j]) && ((*argv)[idx + 1][0] == '-'))
|
||||
value = NULL;
|
||||
else
|
||||
{
|
||||
value = (*argv)[idx + 1];
|
||||
add_pending_null (context, &((*argv)[idx + 1]), NULL);
|
||||
*new_idx = idx + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((*argv)[idx + 1][0] == '-')
|
||||
value = NULL;
|
||||
else
|
||||
{
|
||||
value = (*argv)[idx + 1];
|
||||
add_pending_null (context, &((*argv)[idx + 1]), NULL);
|
||||
*new_idx = idx + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (idx >= *argc - 1 && OPTIONAL_ARG (&group->entries[j]))
|
||||
value = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user