From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 01/11] stringlist: use seperately allocated string
Date: Mon, 30 Apr 2012 14:25:54 +0200 [thread overview]
Message-ID: <1335788764-30430-1-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <20120430122334.GE2992@game.jcrosoft.org>
From: Sascha Hauer <s.hauer@pengutronix.de>
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@pengutronix.de>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
include/stringlist.h | 6 ++++--
lib/stringlist.c | 10 ++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/stringlist.h b/include/stringlist.h
index c923542..4b3cbf3 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);
@@ -22,8 +22,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 a8ff979..c8b835e 100644
--- a/lib/stringlist.c
+++ b/lib/stringlist.c
@@ -16,9 +16,8 @@ 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);
@@ -29,9 +28,8 @@ 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);
+ new = xmalloc(sizeof(*new));
+ new->str = xstrdup(str);
list_add_sort(&new->list, &sl->list, string_list_compare);
--
1.7.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-04-30 12:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 12:23 [PATCH 00/11 v3] improve complete support Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:25 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-04-30 12:25 ` [PATCH 02/11] stringlist: implement string_list_add_asprintf Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:25 ` [PATCH 03/11] complete: add var and device param complete support Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:25 ` [PATCH 04/11] complete: add generic command complete framework Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:25 ` [PATCH 05/11] complete: add device name complete support for devinfo Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:25 ` [PATCH 06/11] complete: add help complete support Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:26 ` [PATCH 07/11] complete: add empty " Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:26 ` [PATCH 08/11] complete: add eth interface " Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:26 ` [PATCH 09/11] complete: add go and sleep support Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:26 ` [PATCH 10/11] complete: add delpart complete support Jean-Christophe PLAGNIOL-VILLARD
2012-04-30 12:26 ` [PATCH 11/11] complete: add executable file support Jean-Christophe PLAGNIOL-VILLARD
2012-05-01 19:43 ` [PATCH 00/11 v3] improve complete support Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2012-04-19 5:38 [PATCH 00/11 v2] " Jean-Christophe PLAGNIOL-VILLARD
2012-04-19 5:44 ` [PATCH 01/11] stringlist: use seperately allocated string Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335788764-30430-1-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox