Allocate the string in string list seperately instead of embedding a zero length string into struct stringlist. Besides looking cleaner this allows us to implement a string_list_asprintf. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- include/stringlist.h | 6 ++++-- lib/stringlist.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/stringlist.h b/include/stringlist.h index 3453e9a..86edcf0 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -5,7 +5,7 @@ struct string_list { struct list_head list; - char str[0]; + char *str; }; int string_list_add(struct string_list *sl, char *str); @@ -20,8 +20,10 @@ static inline void string_list_free(struct string_list *sl) { struct string_list *entry, *safe; - list_for_each_entry_safe(entry, safe, &sl->list, list) + list_for_each_entry_safe(entry, safe, &sl->list, list) { + free(entry->str); free(entry); + } } #endif /* __STRING_H */ diff --git a/lib/stringlist.c b/lib/stringlist.c index 9ccf8fa..3c8ecec 100644 --- a/lib/stringlist.c +++ b/lib/stringlist.c @@ -1,15 +1,15 @@ #include <common.h> #include <xfuncs.h> #include <malloc.h> +#include <xfuncs.h> #include <stringlist.h> int string_list_add(struct string_list *sl, char *str) { struct string_list *new; - new = xmalloc(sizeof(struct string_list) + strlen(str) + 1); - - strcpy(new->str, str); + new = xmalloc(sizeof(*new)); + new->str = xstrdup(str); list_add_tail(&new->list, &sl->list); -- 1.7.5.3 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox