stringlist-functions: add sorted insert
Add sorted insert in stringlist functions. Also added function to checked if string is already in string list. Signed-off-by: Alexander Aring <a.aring@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
56ddc233e4
commit
049100fe37
|
@ -9,6 +9,8 @@ struct string_list {
|
|||
};
|
||||
|
||||
int string_list_add(struct string_list *sl, char *str);
|
||||
int string_list_add_sorted(struct string_list *sl, char *str);
|
||||
int string_list_contains(struct string_list *sl, char *str);
|
||||
void string_list_print_by_column(struct string_list *sl);
|
||||
|
||||
static inline void string_list_init(struct string_list *sl)
|
||||
|
|
|
@ -3,6 +3,15 @@
|
|||
#include <malloc.h>
|
||||
#include <stringlist.h>
|
||||
|
||||
static int string_list_compare(struct list_head *a, struct list_head *b)
|
||||
{
|
||||
char *astr, *bstr;
|
||||
astr = (char *)list_entry(a, struct string_list, list)->str;
|
||||
bstr = (char *)list_entry(b, struct string_list, list)->str;
|
||||
|
||||
return strcmp(astr, bstr);
|
||||
}
|
||||
|
||||
int string_list_add(struct string_list *sl, char *str)
|
||||
{
|
||||
struct string_list *new;
|
||||
|
@ -16,6 +25,31 @@ int string_list_add(struct string_list *sl, char *str)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int string_list_add_sorted(struct string_list *sl, char *str)
|
||||
{
|
||||
struct string_list *new;
|
||||
|
||||
new = xmalloc(sizeof(struct string_list) + strlen(str) + 1);
|
||||
|
||||
strcpy(new->str, str);
|
||||
|
||||
list_add_sort(&new->list, &sl->list, string_list_compare);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int string_list_contains(struct string_list *sl, char *str)
|
||||
{
|
||||
struct string_list *entry;
|
||||
|
||||
list_for_each_entry(entry, &sl->list, list) {
|
||||
if (!strcmp(str, entry->str))
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void string_list_print_by_column(struct string_list *sl)
|
||||
{
|
||||
int len = 0, num, i;
|
||||
|
|
Loading…
Reference in New Issue