devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 23:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified parse_options to take gchar**

Browse Source
This commit is contained in:
James Booth
2014-04-15 00:13:32 +01:00
parent 79088d0150
commit 4425aba1f2
4 changed files with 24 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/parser.c
View File

@@ -374,14 +374,21 @@ get_start(char *string, int tokens)
}
GHashTable *
parse_options(gchar **args, int start, GList *keys, gboolean *res)
parse_options(gchar **args, int start, gchar **opt_keys, gboolean *res)
{
GList *keys = NULL;
int i;
for (i = 0; i < g_strv_length(opt_keys); i++) {
keys = g_list_append(keys, opt_keys[i]);
}
GHashTable *options = NULL;
// no options found, success
if (args[start] == NULL) {
options = g_hash_table_new(g_str_hash, g_str_equal);
*res = TRUE;
g_list_free(keys);
return options;
}
@@ -392,24 +399,28 @@ parse_options(gchar **args, int start, GList *keys, gboolean *res)
// check if option valid
if (g_list_find_custom(keys, args[curr], (GCompareFunc)g_strcmp0) == NULL) {
*res = FALSE;
g_list_free(keys);
return options;
}
// check if duplicate
if (g_list_find_custom(found_keys, args[curr], (GCompareFunc)g_strcmp0) != NULL) {
*res = FALSE;
g_list_free(keys);
return options;
}
// check value given
if (args[curr+1] == NULL) {
*res = FALSE;
g_list_free(keys);
return options;
}
found_keys = g_list_append(found_keys, args[curr]);
}
g_list_free(found_keys);
g_list_free(keys);
// create map
options = g_hash_table_new(g_str_hash, g_str_equal);