Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Jones <drjones@redhat.com>
To: kexec@lists.infradead.org
Subject: [PATCH 3/4] kexec/fs2dt: cleanup pathname
Date: Fri, 20 Nov 2015 12:31:53 -0500	[thread overview]
Message-ID: <1448040714-19841-4-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1448040714-19841-1-git-send-email-drjones@redhat.com>

putnode() will add the trailing '/', avoid having two. Also
pathstart is unused, get rid of it.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 kexec/fs2dt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c
index 9392e85d6d5f3..affee57b9bb62 100644
--- a/kexec/fs2dt.c
+++ b/kexec/fs2dt.c
@@ -39,7 +39,7 @@
 #define MEMRESERVE 256		/* max number of reserved memory blocks */
 #define MEM_RANGE_CHUNK_SZ 2048 /* Initial num dwords for mem ranges */
 
-static char pathname[MAXPATH], *pathstart;
+static char pathname[MAXPATH];
 static char propnames[NAMESPACE] = { 0 };
 static unsigned *dt_base, *dt;
 static unsigned int dt_cur_size;
@@ -800,9 +800,7 @@ static void add_boot_block(char **bufp, off_t *sizep)
 
 void create_flatten_tree(char **bufp, off_t *sizep, const char *cmdline)
 {
-	strcpy(pathname, "/proc/device-tree/");
-
-	pathstart = pathname + strlen(pathname);
+	strcpy(pathname, "/proc/device-tree");
 
 	dt_cur_size = INIT_TREE_WORDS;
 	dt_base = malloc(dt_cur_size*4);
-- 
2.4.3


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  parent reply	other threads:[~2015-11-20 17:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-20 17:31 [PATCH 0/4] [RFT] cleanup /chosen/linux,stdout-path warning Andrew Jones
2015-11-20 17:31 ` [PATCH 1/4] uImage: cleanup some warnings Andrew Jones
2015-11-24  7:00   ` Simon Horman
2015-11-25 17:32     ` Andrew Jones
2015-11-20 17:31 ` [PATCH 2/4] kexec/fs2dt: s/diabled/disabled/ Andrew Jones
2015-11-24  7:00   ` Simon Horman
2015-11-20 17:31 ` Andrew Jones [this message]
2015-11-24  7:01   ` [PATCH 3/4] kexec/fs2dt: cleanup pathname Simon Horman
2015-11-20 17:31 ` [PATCH 4/4] kexec/fs2dt: check for /chosen/stdout-path first Andrew Jones
2015-11-24  7:03   ` Simon Horman

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=1448040714-19841-4-git-send-email-drjones@redhat.com \
    --to=drjones@redhat.com \
    --cc=kexec@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