qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Peter A. G. Crosthwaite" <peter.crosthwaite@petalogix.com>
To: peter.crosthwaite@petalogix.com, qemu-trivial@nongnu.org,
	agraf@suse.de, qemu-devel@nongnu.org
Subject: [Qemu-trivial] [PATCH] device_tree: load_device_tree(): Allow NULL sizep
Date: Fri, 10 Aug 2012 13:54:26 +1000	[thread overview]
Message-ID: <1344570866-28595-2-git-send-email-peter.crosthwaite@petalogix.com> (raw)
In-Reply-To: <1344570866-28595-1-git-send-email-peter.crosthwaite@petalogix.com>

The sizep arg is populated with the size of the loaded device tree. Since this
is one of those informational "please populate" type arguments it should be
optional. Guarded writes to *sizep against NULL accordingly.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Acked-by: Alexander Graf <agraf@suse.de>
---
 device_tree.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/device_tree.c b/device_tree.c
index d7a9b6b..641a48a 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -71,7 +71,9 @@ void *load_device_tree(const char *filename_path, int *sizep)
     int ret;
     void *fdt = NULL;
 
-    *sizep = 0;
+    if (sizep) {
+        *sizep = 0;
+    }
     dt_size = get_image_size(filename_path);
     if (dt_size < 0) {
         printf("Unable to get size of device tree file '%s'\n",
@@ -104,7 +106,9 @@ void *load_device_tree(const char *filename_path, int *sizep)
             filename_path);
         goto fail;
     }
-    *sizep = dt_size;
+    if (sizep) {
+        *sizep = dt_size;
+    }
     return fdt;
 
 fail:
-- 
1.7.0.4



  reply	other threads:[~2012-08-10  3:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-10  3:54 [Qemu-trivial] [PULL 0/1] device_tree: load_device_tree(): Allow NULL sizep Peter A. G. Crosthwaite
2012-08-10  3:54 ` Peter A. G. Crosthwaite [this message]
2012-08-10 13:42   ` [Qemu-trivial] [Qemu-devel] [PATCH] " Stefan Hajnoczi
2012-08-10 23:11     ` Peter Crosthwaite
2012-08-11 12:33       ` Stefan Hajnoczi
2012-08-15 13:41         ` Stefan Hajnoczi
2012-08-16  2:14           ` David Gibson
2012-08-20 13:58             ` Stefan Hajnoczi

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=1344570866-28595-2-git-send-email-peter.crosthwaite@petalogix.com \
    --to=peter.crosthwaite@petalogix.com \
    --cc=agraf@suse.de \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.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;
as well as URLs for NNTP newsgroup(s).