mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/6] bbu: command: create temporary variable holding the pointer to the image
Date: Tue, 30 Jan 2018 09:46:54 +0100	[thread overview]
Message-ID: <20180130084657.31943-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20180130084657.31943-1-s.hauer@pengutronix.de>

Create variable to hold the pointer to the image so that we can
make the data.image pointer const later.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/barebox-update.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/commands/barebox-update.c b/commands/barebox-update.c
index c2f2b68e08..84798ab0d9 100644
--- a/commands/barebox-update.c
+++ b/commands/barebox-update.c
@@ -28,6 +28,7 @@ static int do_barebox_update(int argc, char *argv[])
 {
 	int opt, ret, repair = 0;
 	struct bbu_data data = {};
+	void *image = NULL;
 
 	while ((opt = getopt(argc, argv, "t:yf:ld:r")) > 0) {
 		switch (opt) {
@@ -59,9 +60,10 @@ static int do_barebox_update(int argc, char *argv[])
 	if (argc - optind > 0) {
 		data.imagefile = argv[optind];
 
-		data.image = read_file(data.imagefile, &data.len);
-		if (!data.image)
+		image = read_file(data.imagefile, &data.len);
+		if (!image)
 			return -errno;
+		data.image = image;
 	} else {
 		if (!repair)
 			return COMMAND_ERROR_USAGE;
@@ -69,7 +71,7 @@ static int do_barebox_update(int argc, char *argv[])
 
 	ret = barebox_update(&data);
 
-	free(data.image);
+	free(image);
 
 	return ret;
 }
-- 
2.15.1


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

  parent reply	other threads:[~2018-01-30  8:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-30  8:46 [PATCH 0/6] bbu: Make image pointer const Sascha Hauer
2018-01-30  8:46 ` [PATCH 1/6] bbu: imx-bbu-internal: Do not modify image Sascha Hauer
2018-01-30  8:46 ` [PATCH 2/6] bbu: imx-bbu-internal: make pointers to image const Sascha Hauer
2018-01-30  8:46 ` Sascha Hauer [this message]
2018-01-30  8:46 ` [PATCH 4/6] bbu: Make pointer " Sascha Hauer
2018-01-30  8:46 ` [PATCH 5/6] usb: gadget: fastboot: allow data.image to be const Sascha Hauer
2018-01-30  8:46 ` [PATCH 6/6] ARM: am33xx: bbu: Make pointers to image const Sascha Hauer

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=20180130084657.31943-4-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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