From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-mtd@lists.infradead.org
Cc: kernel@pengutronix.de, Sascha Hauer <s.hauer@pengutronix.de>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 3/5] mkfs.ubifs: simplify make_path with xasprintf
Date: Fri, 16 Oct 2015 17:15:17 +0200 [thread overview]
Message-ID: <1445008519-19928-4-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1445008519-19928-1-git-send-email-mkl@pengutronix.de>
From: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
mkfs.ubifs/mkfs.ubifs.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index 049219b52cc5..a99c61382304 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -227,13 +227,9 @@ static char *make_path(const char *dir, const char *name)
{
char *s;
- s = malloc(strlen(dir) + strlen(name) + 2);
- if (!s)
- return NULL;
- strcpy(s, dir);
- if (dir[strlen(dir) - 1] != '/')
- strcat(s, "/");
- strcat(s, name);
+ xasprintf(&s, "%s%s%s",
+ dir, dir[strlen(dir) - 1] == '/' ? "" : "/", name);
+
return s;
}
--
2.6.1
next prev parent reply other threads:[~2015-10-16 15:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 15:15 [PATCH 0/5] mkfs.ubifs: cleanups + extended attribute support Marc Kleine-Budde
2015-10-16 15:15 ` [PATCH 1/5] mkfs.ubifs: change add_directory argument to 'existing' Marc Kleine-Budde
2015-10-16 15:15 ` [PATCH 2/5] mkfs.ubifs: use xmalloc/xzalloc for allocating memory Marc Kleine-Budde
2015-10-16 15:15 ` Marc Kleine-Budde [this message]
2015-10-16 15:15 ` [PATCH 4/5] mkfs.ubifs: Add extended attribute support Marc Kleine-Budde
2015-10-16 15:15 ` [PATCH 5/5] mkfs.ubifs: Optionally create extended attribute with inode number Marc Kleine-Budde
2015-11-11 14:56 ` [PATCH 0/5] mkfs.ubifs: cleanups + extended attribute support Daniel Walter
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=1445008519-19928-4-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-mtd@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).