aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

refactored autocomplete_add

Browse Source 
Now this function responsible for memory allocation
This commit is contained in:
Dmitry Podgorny 2013-08-26 02:43:59 +03:00
parent 32e18fb1a5
commit 92763d2e68
2 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/tools/autocomplete.c
View File

@ -83,42 +83,19 @@ autocomplete_length(Autocomplete ac)
} }
gboolean gboolean
autocomplete_add(Autocomplete ac, void *item) autocomplete_add(Autocomplete ac, const char *item)
{ {
if (ac->items == NULL) { char *item_cpy;
ac->items = g_slist_append(ac->items, item); GSList *curr = g_slist_find_custom(ac->items, item, (GCompareFunc)strcmp);
return TRUE;
} else {
GSList *curr = ac->items;
while(curr) { // if item already exists
if (curr != NULL) {
// insert return FALSE;
if (g_strcmp0(curr->data, item) > 0) {
ac->items = g_slist_insert_before(ac->items,
curr, item);
return TRUE;
// update
} else if (g_strcmp0(curr->data, item) == 0) {
// only update if data different
if (strcmp(curr->data, item) != 0) {
free(curr->data);
curr->data = item;
return TRUE;
} else {
return FALSE;
}
}
curr = g_slist_next(curr);
}
// hit end, append
ac->items = g_slist_append(ac->items, item);
return TRUE;
} }
item_cpy = strdup(item);
ac->items = g_slist_insert_sorted(ac->items, item_cpy, (GCompareFunc)strcmp);
return TRUE;
} }
gboolean gboolean

2
src/tools/autocomplete.h
View File

@ -38,7 +38,7 @@ Autocomplete obj_autocomplete_new(PStrFunc str_func, PCopyFunc copy_func,
void autocomplete_clear(Autocomplete ac); void autocomplete_clear(Autocomplete ac);
void autocomplete_reset(Autocomplete ac); void autocomplete_reset(Autocomplete ac);
void autocomplete_free(Autocomplete ac); void autocomplete_free(Autocomplete ac);
gboolean autocomplete_add(Autocomplete ac, void *item); gboolean autocomplete_add(Autocomplete ac, const char *item);
gboolean autocomplete_remove(Autocomplete ac, const char * const item); gboolean autocomplete_remove(Autocomplete ac, const char * const item);
GSList * autocomplete_get_list(Autocomplete ac); GSList * autocomplete_get_list(Autocomplete ac);
gchar * autocomplete_complete(Autocomplete ac, gchar *search_str); gchar * autocomplete_complete(Autocomplete ac, gchar *search_str);