dvorka/hstr
1
1
Fork 0
mirror of https://github.com/dvorka/hstr.git synced 2024-12-25 00:44:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed #14 by removing hash set that's no longer neede.

Browse source
This commit is contained in:
Martin Dvorak 2013-12-15 14:18:47 +01:00
parent 1f2ee46e39
commit 0e564239a8
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/hstr.c
View file

@ -109,31 +109,23 @@ unsigned make_selection(char *prefix, HistoryItems *history, int maxSelectionCou
alloc_selection(sizeof(char*) * maxSelectionCount); // TODO realloc alloc_selection(sizeof(char*) * maxSelectionCount); // TODO realloc
unsigned i, selectionCount=0; unsigned i, selectionCount=0;
HashSet set;
hashset_init(&set);
for(i=0; i<history->count && selectionCount<maxSelectionCount; i++) { for(i=0; i<history->count && selectionCount<maxSelectionCount; i++) {
if(history->items[i]!=NULL && !hashset_contains(&set, history->items[i])) { if(history->items[i]) {
if(prefix==NULL) { if(prefix==NULL) {
selection[selectionCount++]=history->items[i]; selection[selectionCount++]=history->items[i];
hashset_add(&set, history->items[i]);
} else { } else {
if(history->items[i]==strstr(history->items[i], prefix)) { if(history->items[i]==strstr(history->items[i], prefix)) {
selection[selectionCount++]=history->items[i]; selection[selectionCount++]=history->items[i];
hashset_add(&set, history->items[i]);
} }
} }
} }
} }
if(prefix!=NULL && selectionCount<maxSelectionCount) { if(prefix && selectionCount<maxSelectionCount) {
for(i=0; i<history->count && selectionCount<maxSelectionCount; i++) { for(i=0; i<history->count && selectionCount<maxSelectionCount; i++) {
if(!hashset_contains(&set, history->items[i])) { char *substring = strstr(history->items[i], prefix);
char *substring = strstr(history->items[i], prefix); if (substring != NULL && substring!=history->items[i]) {
if (substring != NULL && substring!=history->items[i]) { selection[selectionCount++]=history->items[i];
selection[selectionCount++]=history->items[i];
hashset_add(&set, history->items[i]);
}
} }
} }
} }