From: Richard Jones <rjones@trick.home.annexia.org>
Date: Mon, 21 Sep 2009 11:01:11 +0000 (+0100)
Subject: Combine temporary buffers.
X-Git-Tag: 1.0.71~10
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=62b322872543c2ec069ac4fb0103ab758f587cef;p=libguestfs.git

Combine temporary buffers.

buf[], append[] and memsize_str[] were all temporary buffers
used in non-overlapping code.

Combine them to use a single buffer (buf[]).
---

diff --git a/src/guestfs.c b/src/guestfs.c
index bc4fe4e..17d812a 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -984,18 +984,16 @@ guestfs__launch (guestfs_h *g)
 
   if (r == 0) {			/* Child (qemu). */
     char buf[256];
-    char append[256];
-    char memsize_str[256];
 
     /* Set up the full command line.  Do this in the subprocess so we
      * don't need to worry about cleaning up.
      */
     g->cmdline[0] = g->qemu;
 
-    snprintf (memsize_str, sizeof memsize_str, "%d", g->memsize);
-
+    snprintf (buf, sizeof buf, "%d", g->memsize);
     add_cmdline (g, "-m");
-    add_cmdline (g, memsize_str);
+    add_cmdline (g, buf);
+
     add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
     add_cmdline (g, "-nographic");
     add_cmdline (g, "-serial");
@@ -1057,7 +1055,7 @@ guestfs__launch (guestfs_h *g)
     "cgroup_disable=memory " /* saves us about 5 MB of RAM */
 
     /* Linux kernel command line. */
-    snprintf (append, sizeof append,
+    snprintf (buf, sizeof buf,
               LINUX_CMDLINE
               "%s"              /* (selinux) */
               "%s"              /* (verbose) */
@@ -1071,7 +1069,7 @@ guestfs__launch (guestfs_h *g)
     add_cmdline (g, "-initrd");
     add_cmdline (g, (char *) initrd);
     add_cmdline (g, "-append");
-    add_cmdline (g, append);
+    add_cmdline (g, buf);
 
     /* Finish off the command line. */
     incr_cmdline_size (g);