From d72815578f7b8fea9702902d8562430e8a007a46 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 10 Dec 2010 12:19:49 +0000
Subject: [PATCH] Remove several unused local variables.

(Revealed by compiling under Debian where this is a warning).
---
 cat/virt-ls.c        | 1 -
 daemon/mkfs.c        | 2 +-
 df/output.c          | 1 -
 rescue/virt-rescue.c | 1 -
 src/inspect.c        | 4 ----
 src/launch.c         | 1 -
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/cat/virt-ls.c b/cat/virt-ls.c
index 3e789b8..64bae46 100644
--- a/cat/virt-ls.c
+++ b/cat/virt-ls.c
@@ -270,7 +270,6 @@ main (int argc, char *argv[])
     }
     else if (mode == 'l') {
       char *out;
-      size_t i;
 
       if ((out = guestfs_ll (g, dir)) == NULL)
         errors++;
diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 911fad3..cc0ead1 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -36,7 +36,7 @@ int
 do_mkfs_opts (const char *fstype, const char *device, int blocksize)
 {
   const char *argv[MAX_ARGS];
-  size_t i = 0, j;
+  size_t i = 0;
   char blocksize_str[32];
   int r;
   char *err;
diff --git a/df/output.c b/df/output.c
index 52ce063..b60d285 100644
--- a/df/output.c
+++ b/df/output.c
@@ -45,7 +45,6 @@ void
 print_title (void)
 {
   const char *cols[6];
-  size_t i;
 
   cols[0] = _("VirtualMachine");
   cols[1] = _("Filesystem");
diff --git a/rescue/virt-rescue.c b/rescue/virt-rescue.c
index 3ae28e3..6224ad7 100644
--- a/rescue/virt-rescue.c
+++ b/rescue/virt-rescue.c
@@ -112,7 +112,6 @@ main (int argc, char *argv[])
   };
   struct drv *drvs = NULL;
   struct drv *drv;
-  char *p, *file = NULL;
   const char *format = NULL;
   int c;
   int option_index;
diff --git a/src/inspect.c b/src/inspect.c
index 8b21026..46c7fe4 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -609,8 +609,6 @@ check_linux_root (guestfs_h *g, struct inspect_fs *fs)
 static int
 check_freebsd_root (guestfs_h *g, struct inspect_fs *fs)
 {
-  int r;
-
   fs->type = OS_TYPE_FREEBSD;
 
   /* FreeBSD has no authoritative version file.  The version number is
@@ -673,8 +671,6 @@ check_architecture (guestfs_h *g, struct inspect_fs *fs)
 static int
 check_hostname_unix (guestfs_h *g, struct inspect_fs *fs)
 {
-  char **lines;
-
   switch (fs->type) {
   case OS_TYPE_LINUX:
     /* Red Hat-derived would be in /etc/sysconfig/network, and
diff --git a/src/launch.c b/src/launch.c
index e4f4728..e009aae 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -352,7 +352,6 @@ guestfs__launch (guestfs_h *g)
 {
   int r;
   int wfd[2], rfd[2];
-  int tries;
   char unixsock[256];
   struct sockaddr_un addr;
 
-- 
1.8.3.1