luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'parsing' into 'master'

Browse Source 
goption.c: Simplfy parse_short_option()

See merge request GNOME/glib!1999
This commit is contained in:
Philip Withnall 2021-03-19 11:07:16 +00:00
commit 33734480d3
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glib/goption.c
View File

@ -1543,23 +1543,14 @@ parse_short_option (GOptionContext *context,
if (idx < *argc - 1) 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]; value = (*argv)[idx + 1];
add_pending_null (context, &((*argv)[idx + 1]), NULL); add_pending_null (context, &((*argv)[idx + 1]), NULL);
*new_idx = idx + 1; *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])) else if (idx >= *argc - 1 && OPTIONAL_ARG (&group->entries[j]))
value = NULL; value = NULL;